Converted to new class naming convention, as discussed in the dev meeting