Fixing transport beat changes, renaming classes