Capitialization + incorrect class fixes.