Review fixes on naming conventions