Updated build tools version, minor renaming and fix for mute bug.