some updates to naming conventions and testing.