type fix and renaming