Fixing normal getting renamed