fixes some var names to make things easier in the future
fixes merge errors