changed naming conventions for consistancy