Some renaming and tidying