setting naming policy to avoid errors

also renaming some entities
eliminating errors introdoced with rename