Small naming conventions fix