Refactore namings