More consistent naming of the algebras.
Removing duplicate code by redirecting it to the original code.