Corrected naming to be in line with msf convention