Changed init variable names to match pep8. fixes #1