Refactor protected properties to start with an underscore
Fix 0.2.5 upgrade script