Updated naming conventions to fit with new name