Some cleanup after renaming