Fixed Defaulting

Fixed multiple issues that caused some preferences
to defaul to wrong values due to confusion between the
capital and regular strings!

PS 2+3 : DERP!

Change-Id: Iee4f37e3160bab16354d9556f38fbf05e7e125bf