updated naming conventions