Change names for consistency
Minor changes
Merge remote-tracking branch 'origin/develop' into develop