changed naming conventions to things that make sense now since changes made