HouseKeeping: Renaming, fixes, refactoring