add hash name reversion and change regex