Switched to new naming conventions

[ci skip]