fix the interface naming to suit CI envs