scheduling bugfix and name clarification