refactored a few things

renaming a few things for better scalability