Rename ZernikeOptic -> ZernikeAberration, ParameterizedDistortion -> ParameterizedAberration