Mostly finished var naming changes and such