Fix binding & register naming

This fixes subtle naming bugs including binding and registers