fix naming conventions n stuff