Updated to consistent naming conventions