Changed naming convention.
Updated to match new naming convention.