maestro: some renames