refactor naming of core message manipulation funcions