Some class renaming and FloorDefinition refactoring