Fix rather obvious error (registered the same factory twice...) and make capitalization a bit more consistent.