[FEATURE] Refactored some names and routes