Small fixes and renaming