Fixing type names