revamped naming conventions and such