Fix automatic rename from the style checker
Merge branch 'hotfix' into develop