Changed some naming conventions, still need to change QProp
Changed some naming conventions, still need to change QProp