Issue #242: Massive renaming refactoring that removes 'Gateway' prefix from a lot off classes in the gateway package as it is redundant