Refactored Origin subclasses names.