fix temporary workaround for register names