Rename service
Plugging final two registration pages into validation