Fix uniform naming scheme