Correct naming to follow the standards