Minor bugfix and name change