cleanup naming of types