Naming consistency improvement and compiler warning fix.

[IMPROVED]  Small naming improvements to be more consistent with the new API.
[FIXED]     A warning with regards to className not being a known selector.