Make binder naming clearer