Changes to comply new naming conventions