diff --git a/openbsc/README b/openbsc/README
index 88ea328..d01b2cf 100644
--- a/openbsc/README
+++ b/openbsc/README
@@ -9,7 +9,7 @@
  * OsmoBSC - a pure GSM BSC, speaking Abis/IP to the BTS and A/IP to the MSC
  * OsmoBSC-MGCP - MGCP helper to the OsmoBSC software
  * OsmoNITB - a BSC+MSC+VLR+HLR+SMSC "Network in the box".
- * OsmoCSCN - a voice CN with A/IP and IuCS/IP towards the BSC and/or HNB-GW
+ * OsmoMSC - a voice CN with A/IP and IuCS/IP towards the BSC and/or HNB-GW
  * OsmoSGSN - a GPRS SGSN with Gb/IP and IuPS/IP towards the PCU and/or HNB-GW
  * Osmo-GbProxy - a Proxy to aggregate many Gb links as one Gb link to the SGSN
  * OsmoBSCNAT - a gateway aggregating many A links as one A link to the MSC
diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h
index ac573c4..4425a10 100644
--- a/openbsc/include/openbsc/gsm_data.h
+++ b/openbsc/include/openbsc/gsm_data.h
@@ -379,7 +379,7 @@
 	 * contexts. */
 	/* TODO: in OsmoNITB, tz-override used to be BTS-specific. To enable
 	 * BTS|RNC specific timezone overrides for multi-tz networks in
-	 * OsmoCSCN, this should be tied to the location area code (LAC). */
+	 * OsmoMSC, this should be tied to the location area code (LAC). */
 	struct gsm_tz tz;
 };