Fix default class prefix

Most of these commits are the upstream pull as you can see by the diff.