tweak naming policy