rename instance var names
name fix
name fix
fixed naming, adding imports from user module
refactoring to use new names