Remove debug + update name convention