Fix renaming & organization of types