Merge pull request #2860 from eduartua/2716

Conformance of the names of the conferences

10 files changed, 48 insertions, 48 deletions

diff --git a/committee-steering/governance/README.md b/committee-steering/governance/README.md
index b61ac493..b99d0d6c 100644
--- a/committee-steering/governance/README.md
+++ b/committee-steering/governance/README.md
@@ -18,7 +18,7 @@ All Kubernetes SIGs must define a charter defining the scope and governance of t
 6. Send the SIG Charter out for review to steering@kubernetes.io.  Include the subject "SIG Charter Proposal: YOURSIG"
    and a link to the PR in the body.
 7. Typically expect feedback within a week of sending your draft.  Expect longer time if it falls over an
-   event such as Kubecon or holidays.  Make any necessary changes.
+   event such as KubeCon/CloudNativeCon or holidays.  Make any necessary changes.
 8. Once accepted, the steering committee will ratify the PR by merging it.
 
 ## Steps to update an existing SIG charter
diff --git a/committee-steering/governance/sig-governance.md b/committee-steering/governance/sig-governance.md
index 8a45d721..569b9d29 100644
--- a/committee-steering/governance/sig-governance.md
+++ b/committee-steering/governance/sig-governance.md
@@ -84,7 +84,7 @@ Subproject Owner Role.  (this different from a SIG or Organization Member).
 
 - SIG meets bi-weekly on zoom with agenda in meeting notes
   - *SHOULD* be facilitated by chairs unless delegated to specific Members
-- SIG overview and deep-dive sessions organized for Kubecon
+- SIG overview and deep-dive sessions organized for KubeCon/CloudNativeCon
   - *SHOULD* be organized by chairs unless delegated to specific Members
 - SIG updates to Kubernetes community meeting on a regular basis
   - *SHOULD* be presented by chairs unless delegated to specific Members
diff --git a/communication/meeting-notes-archive/q1-2_2018_community_meeting_minutes.md b/communication/meeting-notes-archive/q1-2_2018_community_meeting_minutes.md
index bcc2904e..bc129782 100644
--- a/communication/meeting-notes-archive/q1-2_2018_community_meeting_minutes.md
+++ b/communication/meeting-notes-archive/q1-2_2018_community_meeting_minutes.md
@@ -326,7 +326,7 @@
                 *   Rolling out new contributor workshop + playground
                 *   Will have smaller summit in Shanghai (contact @jberkus)
                 *   Started planning for Seattle, will have an extra ½ day.
-                    *   Registration will be going through kubecon site
+                    *   Registration will be going through KubeCon/CloudNativeCon site
                 *   Manage alacarte events at other people's conferences
             *   Communication pipelines & moderation
                 *   Clean up spam
@@ -778,7 +778,7 @@
         *   Aish Sundar - Shoutout to Benjamin Elder for adding Conformance test results to all Sig-release dashboards - master-blocking and all release branches.
         *   Josh Berkus and Stephen Augustus -  To Misty Stanley-Jones for aggressively and doggedly pursuing 1.11 documentation deadlines, which both gives folks earlier warning about docs needs and lets us bounce incomplete features earlier
     *   Help Wanted
-        *   Looking for Mandarin-speakers to help with new contributor workshop and other events at KubeCon Shanghai.  If you can help, please contact @jberkus / [jberkus@redhat.com](mailto:jberkus@redhat.com)
+        *   Looking for Mandarin-speakers to help with new contributor workshop and other events at KubeCon/CloudNativeCon Shanghai.  If you can help, please contact @jberkus / [jberkus@redhat.com](mailto:jberkus@redhat.com)
         *   [KEP-005](https://github.com/kubernetes/community/blob/master/keps/sig-contributor-experience/0005-contributor-site.md) - Contributor Site - ping [jorge@heptio.com](mailto:jorge@heptio.com) if you can help!
     *   Meet Our Contributors (mentors on demand)
         *   June 6th at 230p and 8pm **UTC** [https://git.k8s.io/community/mentoring/meet-our-contributors.md](https://git.k8s.io/community/mentoring/meet-our-contributors.md)
@@ -852,7 +852,7 @@
         *   External projects:  SIG has something like 20 projects and is breaking them apart, looking for owners and out of tree locations for them to better live.  Projects should move to CSI, a kubernetes-sigs/* repo, a utility library, or EOL
 *   [ 0:00 ] **Announcements**
     *   <span style="text-decoration:underline;">Shoutouts this week</span> (Check in #shoutouts on slack)
-        *   Big shoutout to @carolynvs for being welcoming and encouraging to newcomers, to @paris for all the community energy and dedication, and to all the panelists from the recent Kubecon diversity lunch for sharing their experiences.
+        *   Big shoutout to @carolynvs for being welcoming and encouraging to newcomers, to @paris for all the community energy and dedication, and to all the panelists from the recent KubeCon/CloudNativeCon diversity lunch for sharing their experiences.
         *   Big shoutout to @mike.splain for running the Boston Kubernetes meetup (9 so far!)
         *   everyone at svcat is awesome and patient especially @carolynvs, @Jeremy Rickard & @jpeeler who all took time to help me when I hit some bumps on my first PR.
     *   <span style="text-decoration:underline;">Help Wanted</span>
@@ -962,7 +962,7 @@
         *   SIG Scalability is looking for contributors!
         *   We need more contributor mentors! [Fill this out.](https://goo.gl/forms/17Fzwdm5V2TVWiwy2)
             *   The next Meet Our Contributors (mentors on demand!) will be on June 6th. Check out kubernetes.io/community for time slots and to copy to your calendar.
-    *   **Kubecon Follow Ups**
+    *   **KubeCon/CloudNativeCon Follow Ups**
         *   Videos and slides: [https://github.com/cloudyuga/kubecon18-eu](https://github.com/cloudyuga/kubecon18-eu) Thanks CloudYuga for this!
     *   **Other**
         *   Don't forget to check out [discuss.kubernetes.io](https://discuss.kubernetes.io/)!
@@ -1014,7 +1014,7 @@
             *   Communication platform
             *   Flow in github
         *   [Developers Guide underway](https://github.com/kubernetes/community/issues/1919) under Contributor Docs subproject
-        *   Contributor Experience Update [slide deck](https://docs.google.com/presentation/d/1KUbnP_Bl7ulLJ1evo-X_TdXhlvQWUyru4GuZm51YfjY/edit?usp=sharing) from KubeConEU [if you are in k-dev mailing list, you'll have access)
+        *   Contributor Experience Update [slide deck](https://docs.google.com/presentation/d/1KUbnP_Bl7ulLJ1evo-X_TdXhlvQWUyru4GuZm51YfjY/edit?usp=sharing) from KubeCon/CloudNativeCon UE [if you are in k-dev mailing list, you'll have access)
 *   **Announcements:**
     *   **Shoutouts!**
         *   See someone doing something great in the community? Mention them in #shoutouts on slack and we'll mention them during the community meeting:
@@ -1023,7 +1023,7 @@
         *   Tim Pepper to Aaron Crickenberger for being such a great leader on the project during recent months
         *   Chuck Ha shouts out to the doc team - "Working on the website is such a good experience now that it's on hugo. Page rebuild time went from ~20 seconds to 60ms" :heart emoji:
         *   Jason de Tiber would like to thank Leigh Capili (@stealthybox) for the hard work and long hours helping to fix kubeadm upgrade issues. (2nd shoutout in a row for Leigh! -ed)
-        *   Jorge Castro and Paris Pittman would like to thank Vanessa Heric and the rest of the CNCF/Linux Foundation personnel that helped us pull off another great Contributor Summit and Kubecon
+        *   Jorge Castro and Paris Pittman would like to thank Vanessa Heric and the rest of the CNCF/Linux Foundation personnel that helped us pull off another great Contributor Summit and KubeCon/CloudNativeCon
         *   [Top Stackoverflow Users](https://stackoverflow.com/tags/kubernetes/topusers) in the Kubernetes Tag for the month
             *   Anton Kostenko, Nicola Ben, Maruf Tuhin, Jonah Benton, Const
     *   Message from the docs team re: hugo transition:
@@ -1103,21 +1103,21 @@
             *   Slight changes to structure of object (Unify metrics sources)
         *   Better e2e tests on all HPA functionality
             *   Movement along the path to blocking HPA custom metrics e2e tests
-        *   VPA work coming along, alpha soon (demo at KubeCon)
-        *   Come say hi at KubeCon (Intro and Deep Dive, talks on HPA)
+        *   VPA work coming along, alpha soon (demo at KubeCon/CloudNativeCon)
+        *   Come say hi at KubeCon/CloudNativeCon (Intro and Deep Dive, talks on HPA)
     *   **PM [Jaice Singer DuMars]**
         *   Working on mechanisms to get feedback from the user community (playing with something like [http://kubernetes.report](http://kubernetes.report) -- in development, not ready for distro yet)
-        *   Presenting at KubeCon 16:35 on Thursday ~ Ihor and Aparna
+        *   Presenting at KubeCon/CloudNativeCon 16:35 on Thursday ~ Ihor and Aparna
         *   Working on a charter draft
             *   We actually represent three 'P' areas: product, project, and program
             *   Help SIG focus on implementations
             *   We're trying to look a
 *   **Announcements:**
-    *   **Kubecon next week, no community meeting! **\o/
+    *   **KubeCon/CloudNativeCon next week, no community meeting! **\o/
     *   **Last Chance to Register for the Contributor Summit - **
         *   Registration ends Fri, Apr 7th @ 7pm UTC
-        *   Tuesday, May 1, day before Kubecon
-        *   You must [register here](https://github.com/kubernetes/community/tree/master/events/2018/05-contributor-summit) even if you've registered for Kubecon
+        *   Tuesday, May 1, day before KubeCon/CloudNativeCon
+        *   You must [register here](https://github.com/kubernetes/community/tree/master/events/2018/05-contributor-summit) even if you've registered for KubeCon/CloudNativeCon
         *   SIGs, remember to [put yourself down on the SIG Update sheet](https://docs.google.com/spreadsheets/d/1adztrJ05mQ_cjatYSnvyiy85KjuI6-GuXsRsP-T2R3k/edit#gid=1543199895) to give your 5 minute update that afternoon.
     *   **Shoutouts!**
         *   See someone doing something great in the community? Mention them in #shoutouts on slack and we'll mention them during the community meeting:
@@ -1201,7 +1201,7 @@
         *   @cblecker for fielding so many issues and PRs.
     *   <span style="text-decoration:underline;">Help Wanted?</span>
         *   SIG UI is looking for more active contributors to revitalize the dashboard. Please join their [communication channels](https://github.com/kubernetes/community/blob/master/sig-ui/README.md) and attend the next meeting to announce your interest.
-    *   <span style="text-decoration:underline;">KubeCon EU Update</span>
+    *   <span style="text-decoration:underline;">KubeCon/CloudNativeCon EU Update</span>
         *   Current contributor track session voting will be emailed to attendees today!C
         *   RSVP for Contributor Summit [[here]](https://github.com/kubernetes/community/tree/master/events/2018/05-contributor-summit)
         *   SIG Leads, please do your updates for the 5 minute updates
@@ -1301,8 +1301,8 @@
         *   6 charters in flight working on charter, then going to other SIGs
     *   [r/kubernetes: Ask Me Anything](https://www.reddit.com/r/kubernetes/comments/8b7f0x/we_are_kubernetes_developers_ask_us_anything/) - thanks everyone for participating, lots of user feedback, please have a look.
         *   We'll likely do more of these in the future.
-    *   [Kubernetes Contributor Summit @ Kubecon](https://github.com/kubernetes/community/tree/master/events/2018/05-contributor-summit) - May 1 (jb)
-        *   You need to register for this even if you already registered for Kubecon! Link to the form in the link above.
+    *   [Kubernetes Contributor Summit @ KubeCon/CloudNativeCon](https://github.com/kubernetes/community/tree/master/events/2018/05-contributor-summit) - May 1 (jb)
+        *   You need to register for this even if you already registered for KubeCon/CloudNativeCon! Link to the form in the link above.
         *   New contributor/on-going contrib in morning and general tracks in afternoon
     *   New CNCF Interactive Landscape: [https://landscape.cncf.io/](https://landscape.cncf.io/)  (dan kohn)
 
@@ -1399,8 +1399,8 @@
                 *   They will be migrated, with blog manager opening PRs as needed
     *   SIG Service Catalog - bumped to 5/24
 *   **Announcements**
-    *   [Kubernetes Contributor Summit @ Kubecon](https://github.com/kubernetes/community/tree/master/events/2018/05-contributor-summit) - May 1 [Jorge Castro]
-        *   You need to register for this even if you already registered for Kubecon! Link to the form in the link above.
+    *   [Kubernetes Contributor Summit @ KubeCon/CloudNativeCon](https://github.com/kubernetes/community/tree/master/events/2018/05-contributor-summit) - May 1 [Jorge Castro]
+        *   You need to register for this even if you already registered for KubeCon/CloudNativeCon! Link to the form in the link above.
         *   Current contributor track voting on topics will be emailed to attendees Monday
     *   Reddit r/kubernetes AMA [Jorge Castro]
         *   This next Tuesday: [https://www.reddit.com/r/kubernetes/comments/89gdv0/kubernetes_ama_will_be_on_10_april_tuesday/](https://www.reddit.com/r/kubernetes/comments/89gdv0/kubernetes_ama_will_be_on_10_april_tuesday/)
@@ -1439,7 +1439,7 @@
         *   Generates join keys for kubeadm
         *   Sends information like master election, cluster admin config file, etc back to shared data set
     *   Resources:
-        *   Kubecon Presentation [https://www.slideshare.net/rhirschfeld/kubecon-2017-zero-touch-kubernetes](https://www.slideshare.net/rhirschfeld/kubecon-2017-zero-touch-kubernetes)
+        *   KubeCon/CloudNativeCon Presentation [https://www.slideshare.net/rhirschfeld/kubecon-2017-zero-touch-kubernetes](https://www.slideshare.net/rhirschfeld/kubecon-2017-zero-touch-kubernetes)
         *   Longer Demo Video [https://www.youtube.com/watch?v=OMm6Oz1NF6I](https://www.youtube.com/watch?v=OMm6Oz1NF6I)
         *   Digital Rebar:[https://github.com/digitalrebar/provision](https://github.com/digitalrebar/provision),
         *   Project Site:  [http://rebar.digital](http://rebar.digital)
@@ -1453,7 +1453,7 @@
         *   Looking for contributors to answer questions, 2 slots
         *   Reach out to @paris on Slack if you're interested in participating
     *   Contributor Summit in Copenhagen May 1 - [registration](https://events.linuxfoundation.org/events/kubecon-cloudnativecon-europe-2018/co-located-events/kubernetes-contributor-summit/) is live
-    *   KubeCon Copenhagen (May 2-4) is **on track to sell out**. [Register](https://events.linuxfoundation.org/events/kubecon-cloudnativecon-europe-2018/)
+    *   KubeCon/CloudNativeCon Copenhagen (May 2-4) is **on track to sell out**. [Register](https://events.linuxfoundation.org/events/kubecon-cloudnativecon-europe-2018/)
     *   Shoutouts this week (from #shoutouts in slack):
         *   @nabrahams who picked the 1.10 release notes as his first contribution. We literally could not have done this without him!
 *   [ 0:15 ]** Kubernetes 1.10 Release Retrospective**
@@ -1590,7 +1590,7 @@
     *   Registration for the Contributor Summit is now live:
         *   See [this page](https://events.linuxfoundation.org/events/kubecon-cloudnativecon-europe-2018/co-located-events/kubernetes-contributor-summit/) for details
         *   Please register if you're planning on attending, we need this so we have the correct amount of food!
-        *   Just registering for Kubecon is not enough!
+        *   Just registering for KubeCon/CloudNativeCon is not enough!
     *   [Office Hours Next Week!](https://github.com/kubernetes/community/blob/master/events/office-hours.md)
         *   Volunteer developers needed to answer questions
     *   [Helm Summit Videos](https://www.youtube.com/playlist?list=PL69nYSiGNLP3PlhEKrGA0oN4eY8c4oaAH&disable_polymer=true) are up.
@@ -1628,7 +1628,7 @@
 *   [ 0:00 ] **Graph o' the Week **Zach Corleissen, SIG Docs
     *   Weekly update on data from devstats.k8s.io
     *   [https://k8s.devstats.cncf.io/d/44/time-metrics?orgId=1&var-period=w&var-repogroup_name=Docs&var-repogroup=docs&var-apichange=All&var-size_name=All&var-size=all&var-full_name=Kubernetes](https://k8s.devstats.cncf.io/d/44/time-metrics?orgId=1&var-period=w&var-repogroup_name=Docs&var-repogroup=docs&var-apichange=All&var-size_name=All&var-size=all&var-full_name=Kubernetes)
-    *   Docs folks had vague anxiety (without concrete data) on their response times for issues and PRs.  Devstats shows less than approx. 4 days initial response times during the last year, outside of a few spikes associated with holidays on the calendar and KubeCon.
+    *   Docs folks had vague anxiety (without concrete data) on their response times for issues and PRs.  Devstats shows less than approx. 4 days initial response times during the last year, outside of a few spikes associated with holidays on the calendar and KubeCon/CloudNativeCon.
     *   Introduction of prow into kubernetes/website led to a demonstrable improvement in early 2018
 *   [ 0:00 ] **SIG Updates**
     *   SIG Apps [Adnan Abdulhussein] (confirmed)
@@ -1647,7 +1647,7 @@
         *   [Governance.md updated with subprojects](https://github.com/kubernetes/community/blob/master/governance.md#subprojects)
         *   [WIP: Subproject Meta](https://docs.google.com/document/d/1FHauGII5LNVM-dZcNfzYZ-6WRs9RoPctQ4bw5dczrkk/edit#heading=h.2nslsje41be1)
         *   [WIP: Charter FAQ (the "Why"s)](https://github.com/kubernetes/community/pull/1908)
-    *   Reminder: [Contributor Summit](https://github.com/kubernetes/community/tree/master/events/2018/05-contributor-summit), 1 May, day before Kubecon
+    *   Reminder: [Contributor Summit](https://github.com/kubernetes/community/tree/master/events/2018/05-contributor-summit), 1 May, day before KubeCon/CloudNativeCon
     *   CNCF would like feedback on the draft blog post for 1.10 beta:
         *   [https://kubernetes.io/blog/2018/03/first-beta-version-of-kubernetes-1-10/](https://kubernetes.io/blog/2018/03/first-beta-version-of-kubernetes-1-10/)
         *   Please contact [Natasha Woods](mailto:nwoods@linuxfoundation.org) with your feedback
@@ -1727,9 +1727,9 @@
 *   [ 0:00 ] <strong>Announcements</strong>
     *   [Owner/Maintainer ](https://github.com/kubernetes/community/pull/1861/files)[pwittrock]
         *   Maintainer is folding into Owner
-    *   Reminder: Contributor Summit happens 1 May, day before Kubecon
+    *   Reminder: Contributor Summit happens 1 May, day before KubeCon/CloudNativeCon
         *   [https://github.com/kubernetes/community/tree/master/events/2018/05-contributor-summit](https://github.com/kubernetes/community/tree/master/events/2018/05-contributor-summit)
-    *   Kubecon price increase March 9
+    *   KubeCon/CloudNativeCon price increase March 9
         *   [https://events.linuxfoundation.org/events/kubecon-cloudnativecon-europe-2018/](https://events.linuxfoundation.org/events/kubecon-cloudnativecon-europe-2018/)
         *   Copenhagen May 2-4, 2018
     *   [Meet Our Contributors is next Weds!](https://github.com/kubernetes/community/blob/master/mentoring/meet-our-contributors.md)
@@ -1772,7 +1772,7 @@
     *   SIG Cluster Lifecycle [First Last]
         *   Not happening
 *   [ 0:00 ] **Announcements**
-    *   Reminder: Contributor Summit happens 1 May, day before Kubecon
+    *   Reminder: Contributor Summit happens 1 May, day before KubeCon/CloudNativeCon
         *   [https://github.com/kubernetes/community/tree/master/events/2018/05-contributor-summit](https://github.com/kubernetes/community/tree/master/events/2018/05-contributor-summit)
     *   Shoutouts this week
         *   Zhonghu Xu - @hzxuzhonghu for many high quality apiserver APIs PRs
@@ -1866,7 +1866,7 @@
             *   Roadshow!
             *   F2F this Tuesday @ INDEX
             *   Contributor Summit in Copenhagen
-            *   May 1; registration will be on KubeCon site this week
+            *   May 1; registration will be on KubeCon/CloudNativeCon site this week
             *   New weekly meeting (from bi-weekly) same day / time (Weds @ 5pUTC)
     *   SIG API Machinery [Daniel Smith](c)
         *   Reminder: SIG-API doesn't own the API (that's SIG-architecture), but rather mechanics in API server, registry and discovery
@@ -1876,7 +1876,7 @@
 *   [ 0:00 ] **Announcements**
     *   Office hours next week!
         *   [https://github.com/kubernetes/community/blob/master/events/office-hours.md](https://github.com/kubernetes/community/blob/master/events/office-hours.md)
-    *   Reminder: Contributor Summit will be 1 May, the day before Kubecon EU: [https://github.com/kubernetes/community/tree/master/events/2018/05-contributor-summit](https://github.com/kubernetes/community/tree/master/events/2018/05-contributor-summit)
+    *   Reminder: Contributor Summit will be 1 May, the day before KubeCon/CloudNativeCon EU: [https://github.com/kubernetes/community/tree/master/events/2018/05-contributor-summit](https://github.com/kubernetes/community/tree/master/events/2018/05-contributor-summit)
     *   /lgtm, /approve and the principle of least surprise
         *   [https://github.com/kubernetes/test-infra/issues/6589](https://github.com/kubernetes/test-infra/issues/6589)
         *   Do we all need to use [the exact same code review process](https://github.com/kubernetes/community/blob/master/contributors/guide/owners.md#the-code-review-process)?
@@ -2090,7 +2090,7 @@
         *   Feel free to comment offline or on the issue if you have comments
         *   TL;DR: call it the "control plane"
         *   Issue: [https://github.com/kubernetes/website/issues/6525](https://github.com/kubernetes/website/issues/6525)
-    *   Contributor Summit for Kubecon EU [Jorge and Paris]
+    *   Contributor Summit for KubeCon/CloudNativeCon EU [Jorge and Paris]
         *   SAVE THE DATE: May 1, 2018
         *   [https://github.com/kubernetes/community/pull/1718](https://github.com/kubernetes/community/pull/1718)
     *   #shoutouts - [Jorge Castro]
@@ -2136,7 +2136,7 @@
         *   Breaking up the monolithic kubectl.
         *   
 *   [ 0:00 ] **Announcements**
-    *   SIG leads: register to offer intros and deep dives in SIG track at KubeCon Copenhagen (May 2-4): [overview](https://groups.google.com/forum/#!searchin/kubernetes-dev/kohn%7Csort:date/kubernetes-dev/5U-eNRBav2Q/g71MW47ZAgAJ), [signup](https://docs.google.com/forms/d/e/1FAIpQLSedSif6MwGfdI1-Rb33NRjTYwotQtIhNL7-ebtYQoDARPB2Tw/viewform) (1/31 deadline)
+    *   SIG leads: register to offer intros and deep dives in SIG track at KubeCon/CloudNativeCon Copenhagen (May 2-4): [overview](https://groups.google.com/forum/#!searchin/kubernetes-dev/kohn%7Csort:date/kubernetes-dev/5U-eNRBav2Q/g71MW47ZAgAJ), [signup](https://docs.google.com/forms/d/e/1FAIpQLSedSif6MwGfdI1-Rb33NRjTYwotQtIhNL7-ebtYQoDARPB2Tw/viewform) (1/31 deadline)
     *   [SIG Contributor Experience news: new lead, new meeting](https://groups.google.com/forum/#!topic/kubernetes-dev/65S1Y3IK8PQ)
     *   [Meet Our Contributors ](https://github.com/kubernetes/community/blob/master/mentoring/meet-our-contributors.md)- Feb 7th [Paris]
         *   730a PST/ 3:30 pm UTC & 1pm PST / 9pm UTC
@@ -2200,7 +2200,7 @@
     *   GSoC [Ihor D]
         *   [https://github.com/cncf/soc](https://github.com/cncf/soc); [k8s gh](https://github.com/kubernetes/community/blob/master/mentoring/google-summer-of-code.md)
         *   nikhita has volunteered to drive this program for Kubernetes
-    *   SIG Intros & Deep Dives sessions registration at KubeCon & CloudNativeCon will be announced shortly (stay tuned!)
+    *   SIG Intros & Deep Dives sessions registration at KubeCon/CloudNativeCon & CloudNativeCon will be announced shortly (stay tuned!)
     *   Changes to this meeting's format [Jorge Castro]
         *   SIGs scheduled per cycle instead of adhoc
         *   Demo changes
diff --git a/contributors/guide/non-code-contributions.md b/contributors/guide/non-code-contributions.md
index 8e728618..29bce79c 100644
--- a/contributors/guide/non-code-contributions.md
+++ b/contributors/guide/non-code-contributions.md
@@ -73,7 +73,7 @@ These are roles that are important to each and every SIG within the Kubernetes p
   - Editing PR text: release note, statement
 - Events
   - Organizing/helping run Face-to-Face meetings for SIGs/WGs/subprojects
-  - Putting together SIG Intros & Deep-dives for Kubecon
+  - Putting together SIG Intros & Deep-dives for KubeCon/CloudNativeCon
 
 #### Non-Code Tasks in Primarily-Code roles
 These are roles that are not code-based, but require knowledge of either general coding, or specific domain knowledge of the Kubernetes code base.
diff --git a/events/2017/12-contributor-summit/feature-roadmap-2018.md b/events/2017/12-contributor-summit/feature-roadmap-2018.md
index d2ae01ac..7c955b54 100644
--- a/events/2017/12-contributor-summit/feature-roadmap-2018.md
+++ b/events/2017/12-contributor-summit/feature-roadmap-2018.md
@@ -1,4 +1,4 @@
-Contributor summit - Kubecon 2017
+Contributor summit - KubeCon/CloudNativeCon 2017
 
 **@AUTHORS - CONNOR DOYLE**
 
diff --git a/events/2018/05-contributor-summit/README.md b/events/2018/05-contributor-summit/README.md
index a3eb54b9..df5c2a22 100644
--- a/events/2018/05-contributor-summit/README.md
+++ b/events/2018/05-contributor-summit/README.md
@@ -17,7 +17,7 @@ In some sense, the summit is a real-life extension of the community meetings and
 
 ## When and Where
 
-- Tuesday, May 1, 2018 (before Kubecon EU)
+- Tuesday, May 1, 2018 (before KubeCon/CloudNativeCon EU)
 - Bella Center, Copenhagen, Denmark
 - Registration and breakfast start at 8am in Room C1-M0
 - Happy hour reception onsite to close at 5:30pm
@@ -58,7 +58,7 @@ There is a [Slack channel](https://kubernetes.slack.com/messages/contributor-sum
 | 7:00        | EmpowerHER event (offsite)      |                                 
 
 - SIG Updates (~5 minutes per SIG)
-  - 2 slides per SIG, focused on cross-SIG issues, not internal SIG discussions (those are for Kubecon)
+  - 2 slides per SIG, focused on cross-SIG issues, not internal SIG discussions (those are for KubeCon/CloudNativeCon)
   - Identify potential issues that might affect multiple SIGs across the project
   - One-to-many announcements about changes a SIG expects that might affect others
 - Track Leads
@@ -68,6 +68,6 @@ There is a [Slack channel](https://kubernetes.slack.com/messages/contributor-sum
 
 ## Misc:
 
-A photographer and videographer will be onsite collecting b-roll and other shots for KubeCon. If you would rather not be involved, please reach out to an organizer on the day of so we may accommodate you.  
+A photographer and videographer will be onsite collecting b-roll and other shots for KubeCon/CloudNativeCon. If you would rather not be involved, please reach out to an organizer on the day of so we may accommodate you.  
 
 Further details to be updated on this doc. Please check back for a complete guide.
diff --git a/events/2018/05-contributor-summit/new-contributor-notes.md b/events/2018/05-contributor-summit/new-contributor-notes.md
index 1858fd85..8ce9aa68 100644
--- a/events/2018/05-contributor-summit/new-contributor-notes.md
+++ b/events/2018/05-contributor-summit/new-contributor-notes.md
@@ -1,4 +1,4 @@
-# Kubernetes New Contributor Workshop - KubeCon EU 2018 - Notes
+# Kubernetes New Contributor Workshop - KubeCon/CloudNativeCon EU 2018 - Notes
 
 Joining in the beginning was onboarding on a yacht
 Now is more onboarding a BIG cruise ship.
@@ -110,7 +110,7 @@ Everything will be refactored (cleaning, move, merged,...)
 
 ### Project
 
-- [kubernetes/Community](https://github.com/kubernetes/Community): Kubecon, proposition, Code of conduct and Contribution guideline, SIG-list
+- [kubernetes/Community](https://github.com/kubernetes/Community): KubeCon/CloudNativeCon, proposition, Code of conduct and Contribution guideline, SIG-list
 - [kubernetes/Features](https://github.com/kubernetes/Features): Features proposal for future release
 - [kubernetes/Steering](https://github.com/kubernetes/Steering)
 - [kubernetes/Test-Infra](https://github.com/kubernetes/Test-Infra): All related to test except Perf
diff --git a/keps/sig-contributor-experience/0007-20180403-community-forum.md b/keps/sig-contributor-experience/0007-20180403-community-forum.md
index dd8963f9..c187af69 100644
--- a/keps/sig-contributor-experience/0007-20180403-community-forum.md
+++ b/keps/sig-contributor-experience/0007-20180403-community-forum.md
@@ -102,7 +102,7 @@ The site would be forum.k8s.io, and would be linked to from the homepage and maj
 - Post announcements about related kubernetes projects
   - Give the ecosystem of tools around k8s a place to go and build communities around all the tools people are building. 
   - "Jill's neat K8s project on github" is too small to have it's own official k8s presence, but it could be a post on a forum. 
-- Events section for meetups and Kubecon
+- Events section for meetups and KubeCon/CloudNativeCon
 - Sub boards for meetup groups
 - Sub boards for non-english speaking community members
 - Developer section can include:
@@ -143,7 +143,7 @@ The site would be forum.k8s.io, and would be linked to from the homepage and maj
 ### Risks and Mitigations
 
 - One more thing to check everyday(tm)
-  - User fatigue with mailing lists, discourse, slack, stackoverflow, youtube channel, kubecon, your local meetup, etc.
+  - User fatigue with mailing lists, discourse, slack, stackoverflow, youtube channel, KubeCon/CloudNativeCon, your local meetup, etc.
   - This is why I am proposing we investigate if we can replace the lists as well, two birds with one stone. 
 - Lack of developer participation
   - The mailing lists work, how suitable is Discourse to replace a mailing list these days? CNCF has tried Discourse in the past. See [@cra's post](https://twitter.com/cra/status/981548716405547008)
diff --git a/sig-azure/charter.md b/sig-azure/charter.md
index bf282276..87f0324f 100644
--- a/sig-azure/charter.md
+++ b/sig-azure/charter.md
@@ -53,7 +53,7 @@ _With regards to leadership roles i.e., Chairs, Technical Leads, and Subproject
 
 - SIG meets bi-weekly on zoom with agenda in meeting notes 
   - SHOULD be facilitated by chairs unless delegated to specific Members 
-- SIG overview and deep-dive sessions organized for Kubecon 
+- SIG overview and deep-dive sessions organized for KubeCon/CloudNativeCon 
   - SHOULD be organized by chairs unless delegated to specific Members 
 - Contributing instructions defined in the SIG CONTRIBUTING.md 
 
@@ -97,4 +97,4 @@ Issues impacting multiple subprojects in the SIG should be resolved by SIG Techn
 [super-majority]: https://en.wikipedia.org/wiki/Supermajority#Two-thirds_vote
 [KEP]: https://github.com/kubernetes/community/blob/master/keps/0000-kep-template.md
 [sigs.yaml]: https://github.com/kubernetes/community/blob/master/sigs.yaml#L1454
-[OWNERS]: contributors/devel/owners.md
\ No newline at end of file
+[OWNERS]: contributors/devel/owners.md
diff --git a/sig-storage/contributing.md b/sig-storage/contributing.md
index 09199da6..2e275e12 100644
--- a/sig-storage/contributing.md
+++ b/sig-storage/contributing.md
@@ -5,16 +5,16 @@ We recommend the following presentations, docs, and videos to help get familiar
 | Date | Title | Link | Description |
 | --- | --- | --- | --- |
 | - | Persistent Volume Framework | [Doc](http://kubernetes.io/docs/user-guide/persistent-volumes/) | Public user docs for Kubernetes Persistent Volume framework.
-| 2018 May 03 | SIG Storage Intro | [Video](https://www.youtube.com/watch?v=GvrTl2T-Tts&list=PLj6h78yzYM2N8GdbjmhVU65KYm_68qBmo&index=164&t=0s) | An overview of SIG Storage By Saad Ali at Kubecon EU 2018. |
-| 2018 May 04 | Kubernetes Storage Lingo 101 | [Video](https://www.youtube.com/watch?v=uSxlgK1bCuA&t=0s&index=300&list=PLj6h78yzYM2N8GdbjmhVU65KYm_68qBmo) | An overview of various terms used in Kubernetes storage and what they mean by Saad Ali at Kubecon EU 2018.|
+| 2018 May 03 | SIG Storage Intro | [Video](https://www.youtube.com/watch?v=GvrTl2T-Tts&list=PLj6h78yzYM2N8GdbjmhVU65KYm_68qBmo&index=164&t=0s) | An overview of SIG Storage By Saad Ali at KubeCon/CloudNativeCon EU 2018. |
+| 2018 May 04 | Kubernetes Storage Lingo 101 | [Video](https://www.youtube.com/watch?v=uSxlgK1bCuA&t=0s&index=300&list=PLj6h78yzYM2N8GdbjmhVU65KYm_68qBmo) | An overview of various terms used in Kubernetes storage and what they mean by Saad Ali at KubeCon/CloudNativeCon EU 2018.|
 | 2017 May 18 | Storage Classes & Dynamic Provisioning in Kubernetes |[Video](https://youtu.be/qktFhjJmFhg)| Intro to the basic Kubernetes storage concepts for users (direct volume reference, PV/PVC, and dynamic provisioning). |
 | 2017 March 29 | Dynamic Provisioning and Storage Classes in Kubernetes |[Blog post](https://kubernetes.io/blog/2017/03/dynamic-provisioning-and-storage-classes-kubernetes/)| Overview of Dynamic Provisioning and Storage Classes in Kubernetes at GA. |
-| 2017 March 29 | How Kubernetes Storage Works | [Slides](https://docs.google.com/presentation/d/1Yl5JKifcncn0gSZf3e1dWspd8iFaWObLm9LxCaXZJIk/edit?usp=sharing) | Overview for developers on how Kubernetes storage works for KubeCon EU 2017 by Saad Ali
+| 2017 March 29 | How Kubernetes Storage Works | [Slides](https://docs.google.com/presentation/d/1Yl5JKifcncn0gSZf3e1dWspd8iFaWObLm9LxCaXZJIk/edit?usp=sharing) | Overview for developers on how Kubernetes storage works for KubeCon/CloudNativeCon EU 2017 by Saad Ali
 | 2017 February 17 | Overview of Dynamic Provisioning for SIG Apps | [Video](https://youtu.be/NXUHmxXytUQ?t=10m33s) | Overview of Storage Classes and Dynamic Provisioning for SIG Apps
 | 2016 October 7 | Dynamic Provisioning and Storage Classes in Kubernetes |[Blog post](https://kubernetes.io/blog/2016/10/dynamic-provisioning-and-storage-in-kubernetes/)| Overview of Dynamic Provisioning and Storage Classes in Kubernetes at Beta. |
 | 2016 July 26 | Overview of Basic Volume for SIG Apps | [Video](https://youtu.be/DrLGxkFdDNc?t=11m19s) | Overview of Basic Volume for SIG Apps
-| 2016 March 25 | The State of State | [Video](https://www.youtube.com/watch?v=jsTQ24CLRhI&index=6&list=PLosInM-8doqcBy3BirmLM4S_pmox6qTw3) | The State of State at KubeCon EU 2016 by Matthew Bates
-| 2016 March 25 | Kubernetes Storage 101 | [Video](https://www.youtube.com/watch?v=ZqTHe6Xj0Ek&list=PLosInM-8doqcBy3BirmLM4S_pmox6qTw3&index=38) | Kubernetes Storage 101 at KubeCon EU 2016 by Erin Boyd
+| 2016 March 25 | The State of State | [Video](https://www.youtube.com/watch?v=jsTQ24CLRhI&index=6&list=PLosInM-8doqcBy3BirmLM4S_pmox6qTw3) | The State of State at KubeCon/CloudNativeCon EU 2016 by Matthew Bates
+| 2016 March 25 | Kubernetes Storage 101 | [Video](https://www.youtube.com/watch?v=ZqTHe6Xj0Ek&list=PLosInM-8doqcBy3BirmLM4S_pmox6qTw3&index=38) | Kubernetes Storage 101 at KubeCon/CloudNativeCon EU 2016 by Erin Boyd
 
 Keep in mind that these artifacts reflect the state of the art at the time they were created. In Kubernetes we try very hard to maintain backwards compatibility, but Kubernetes is a fast moving project and we do add features going forward and attending the Storage SIG meetings and the Storage SIG Google group are both good ways of continually staying up to speed.