diff --git a/samples/blacksim/main.cpp b/samples/blacksim/main.cpp
index c8c7d88f4..4750fb649 100644
--- a/samples/blacksim/main.cpp
+++ b/samples/blacksim/main.cpp
@@ -32,7 +32,7 @@ int main(int argc, char *argv[])
     BlackSim::registerMetadata();
 
     streamOut << "Run samples:" << endl;
-    streamOut << "1 .. FS common" << endl;
+    streamOut << "1 .. FS common / Simulation" << endl;
     streamOut << "2 .. FSX" << endl;
     streamOut << "3 .. Mappings" << endl;
     streamOut << "x .. exit" << endl;
diff --git a/src/blackcore/context_settings.h b/src/blackcore/context_settings.h
index 2ef076ee2..07e484f48 100644
--- a/src/blackcore/context_settings.h
+++ b/src/blackcore/context_settings.h
@@ -1,7 +1,11 @@
-/* Copyright (C) 2013 VATSIM Community / authors
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/* Copyright (C) 2013
+ * swift Project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
 
 //! \file
 
diff --git a/src/blackcore/context_settings_impl.h b/src/blackcore/context_settings_impl.h
index 34d30f942..193e8bd17 100644
--- a/src/blackcore/context_settings_impl.h
+++ b/src/blackcore/context_settings_impl.h
@@ -1,7 +1,13 @@
-/* Copyright (C) 2013 VATSIM Community / authors
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/* Copyright (C) 2013
+ * swift Project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
+
+//! \file
 
 #ifndef BLACKCORE_CONTEXTSETTINGS_IMPL_H
 #define BLACKCORE_CONTEXTSETTINGS_IMPL_H
diff --git a/src/blackcore/context_simulator.cpp b/src/blackcore/context_simulator.cpp
index 6659b8ba1..dc0dd1ba9 100644
--- a/src/blackcore/context_simulator.cpp
+++ b/src/blackcore/context_simulator.cpp
@@ -1,7 +1,11 @@
-/* Copyright (C) 2013 VATSIM Community / contributors
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/* Copyright (C) 2013
+ * swift Project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
 
 #include "context_simulator.h"
 #include "context_simulator_impl.h"
diff --git a/src/blackcore/context_simulator.h b/src/blackcore/context_simulator.h
index a424ba8fc..8b7f2da7e 100644
--- a/src/blackcore/context_simulator.h
+++ b/src/blackcore/context_simulator.h
@@ -132,7 +132,7 @@ namespace BlackCore
 
         //! Changed remote aircraft (e.g. by disabling aircraft)
         //! \todo tbd No add/remove remote aircraft function as those are added implicitly by accessing airspace monitor
-        virtual int changeRemoteAircraft(const BlackMisc::Simulation::CSimulatedAircraft &changedAircraft, const BlackMisc::CPropertyIndexVariantMap &changeValues) = 0;
+        virtual int changeRemoteAircraft(const BlackMisc::Simulation::CSimulatedAircraft &toChangeAircraft, const BlackMisc::CPropertyIndexVariantMap &changeValues) = 0;
 
         //! Set time synchronization between simulator and user's computer time
         //! \remarks not all drivers implement this, e.g. if it is an intrinsic simulator feature