Change naming to match newer mLib conventions.