naming policy fix