Refactor: shorten type references
More code shortening (hashtable_... => ... in private files)