changed to a better naming schema. i will try to keep class / function naming consistent from now on.