Some more renaming
Refactored to not use variable with same name, removing a warning
Rename property factory functions to avoid duplicate function names