A bit of renaming and restructuring