Refact names and redirect