Refactor - Rename to respect the default convention (no /-- but /)