Refactoring - some renaming to keep things consistent.