Update and fall inline with new naming