Merge branch 'refacto/renaming'