diff --git a/bigbluebutton-html5/imports/api/2.0/annotation/index.js b/bigbluebutton-html5/imports/api/2.0/annotation/index.js
deleted file mode 100755
index bdeadce6dc..0000000000
--- a/bigbluebutton-html5/imports/api/2.0/annotation/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export default new Mongo.Collection('annotation');
diff --git a/bigbluebutton-html5/imports/api/2.0/annotations/index.js b/bigbluebutton-html5/imports/api/2.0/annotations/index.js
new file mode 100755
index 0000000000..6059c86797
--- /dev/null
+++ b/bigbluebutton-html5/imports/api/2.0/annotations/index.js
@@ -0,0 +1 @@
+export default new Mongo.Collection('annotations');
diff --git a/bigbluebutton-html5/imports/api/2.0/annotation/server/eventHandlers.js b/bigbluebutton-html5/imports/api/2.0/annotations/server/eventHandlers.js
similarity index 100%
rename from bigbluebutton-html5/imports/api/2.0/annotation/server/eventHandlers.js
rename to bigbluebutton-html5/imports/api/2.0/annotations/server/eventHandlers.js
diff --git a/bigbluebutton-html5/imports/api/2.0/annotation/server/handlers/whiteboardAnnotations.js b/bigbluebutton-html5/imports/api/2.0/annotations/server/handlers/whiteboardAnnotations.js
similarity index 94%
rename from bigbluebutton-html5/imports/api/2.0/annotation/server/handlers/whiteboardAnnotations.js
rename to bigbluebutton-html5/imports/api/2.0/annotations/server/handlers/whiteboardAnnotations.js
index 96dd9601dc..e5fda2ff9e 100755
--- a/bigbluebutton-html5/imports/api/2.0/annotation/server/handlers/whiteboardAnnotations.js
+++ b/bigbluebutton-html5/imports/api/2.0/annotations/server/handlers/whiteboardAnnotations.js
@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import { check } from 'meteor/check';
-import Annotations from '/imports/api/2.0/annotation';
+import Annotations from '/imports/api/2.0/annotations';
 import addAnnotation from '../modifiers/addAnnotation';
 import removeAnnotation from '../modifiers/removeAnnotation';
 
diff --git a/bigbluebutton-html5/imports/api/2.0/annotation/server/handlers/whiteboardCleared.js b/bigbluebutton-html5/imports/api/2.0/annotations/server/handlers/whiteboardCleared.js
similarity index 100%
rename from bigbluebutton-html5/imports/api/2.0/annotation/server/handlers/whiteboardCleared.js
rename to bigbluebutton-html5/imports/api/2.0/annotations/server/handlers/whiteboardCleared.js
diff --git a/bigbluebutton-html5/imports/api/2.0/annotation/server/handlers/whiteboardSend.js b/bigbluebutton-html5/imports/api/2.0/annotations/server/handlers/whiteboardSend.js
similarity index 100%
rename from bigbluebutton-html5/imports/api/2.0/annotation/server/handlers/whiteboardSend.js
rename to bigbluebutton-html5/imports/api/2.0/annotations/server/handlers/whiteboardSend.js
diff --git a/bigbluebutton-html5/imports/api/2.0/annotation/server/handlers/whiteboardUndo.js b/bigbluebutton-html5/imports/api/2.0/annotations/server/handlers/whiteboardUndo.js
similarity index 100%
rename from bigbluebutton-html5/imports/api/2.0/annotation/server/handlers/whiteboardUndo.js
rename to bigbluebutton-html5/imports/api/2.0/annotations/server/handlers/whiteboardUndo.js
diff --git a/bigbluebutton-html5/imports/api/2.0/annotation/server/index.js b/bigbluebutton-html5/imports/api/2.0/annotations/server/index.js
similarity index 100%
rename from bigbluebutton-html5/imports/api/2.0/annotation/server/index.js
rename to bigbluebutton-html5/imports/api/2.0/annotations/server/index.js
diff --git a/bigbluebutton-html5/imports/api/2.0/annotation/server/methods.js b/bigbluebutton-html5/imports/api/2.0/annotations/server/methods.js
similarity index 100%
rename from bigbluebutton-html5/imports/api/2.0/annotation/server/methods.js
rename to bigbluebutton-html5/imports/api/2.0/annotations/server/methods.js
diff --git a/bigbluebutton-html5/imports/api/2.0/annotation/server/modifiers/addAnnotation.js b/bigbluebutton-html5/imports/api/2.0/annotations/server/modifiers/addAnnotation.js
similarity index 98%
rename from bigbluebutton-html5/imports/api/2.0/annotation/server/modifiers/addAnnotation.js
rename to bigbluebutton-html5/imports/api/2.0/annotations/server/modifiers/addAnnotation.js
index d1cbf6707d..72c3b43b2b 100644
--- a/bigbluebutton-html5/imports/api/2.0/annotation/server/modifiers/addAnnotation.js
+++ b/bigbluebutton-html5/imports/api/2.0/annotations/server/modifiers/addAnnotation.js
@@ -1,6 +1,6 @@
 import { Match, check } from 'meteor/check';
 import Logger from '/imports/startup/server/logger';
-import Annotations from '/imports/api/2.0/annotation';
+import Annotations from '/imports/api/2.0/annotations';
 
 const ANNOTATION_TYPE_TEXT = 'text';
 const ANNOTATION_TYPE_PENCIL = 'pencil';
diff --git a/bigbluebutton-html5/imports/api/2.0/annotation/server/modifiers/clearAnnotations.js b/bigbluebutton-html5/imports/api/2.0/annotations/server/modifiers/clearAnnotations.js
similarity index 84%
rename from bigbluebutton-html5/imports/api/2.0/annotation/server/modifiers/clearAnnotations.js
rename to bigbluebutton-html5/imports/api/2.0/annotations/server/modifiers/clearAnnotations.js
index 4abcc67ee4..610ac1bf5b 100755
--- a/bigbluebutton-html5/imports/api/2.0/annotation/server/modifiers/clearAnnotations.js
+++ b/bigbluebutton-html5/imports/api/2.0/annotations/server/modifiers/clearAnnotations.js
@@ -1,4 +1,4 @@
-import Annotations from '/imports/api/2.0/annotation';
+import Annotations from '/imports/api/2.0/annotations';
 import Logger from '/imports/startup/server/logger';
 
 export default function clearAnnotations(meetingId) {
diff --git a/bigbluebutton-html5/imports/api/2.0/annotation/server/modifiers/clearAnnotationsWhiteboard.js b/bigbluebutton-html5/imports/api/2.0/annotations/server/modifiers/clearAnnotationsWhiteboard.js
similarity index 90%
rename from bigbluebutton-html5/imports/api/2.0/annotation/server/modifiers/clearAnnotationsWhiteboard.js
rename to bigbluebutton-html5/imports/api/2.0/annotations/server/modifiers/clearAnnotationsWhiteboard.js
index 739e31d7dc..72f664f929 100644
--- a/bigbluebutton-html5/imports/api/2.0/annotation/server/modifiers/clearAnnotationsWhiteboard.js
+++ b/bigbluebutton-html5/imports/api/2.0/annotations/server/modifiers/clearAnnotationsWhiteboard.js
@@ -1,4 +1,4 @@
-import Annotations from '/imports/api/2.0/annotation';
+import Annotations from '/imports/api/2.0/annotations';
 import Logger from '/imports/startup/server/logger';
 import { check } from 'meteor/check';
 
diff --git a/bigbluebutton-html5/imports/api/2.0/annotation/server/modifiers/removeAnnotation.js b/bigbluebutton-html5/imports/api/2.0/annotations/server/modifiers/removeAnnotation.js
similarity index 91%
rename from bigbluebutton-html5/imports/api/2.0/annotation/server/modifiers/removeAnnotation.js
rename to bigbluebutton-html5/imports/api/2.0/annotations/server/modifiers/removeAnnotation.js
index 81f4ae4491..04a8ec71ab 100644
--- a/bigbluebutton-html5/imports/api/2.0/annotation/server/modifiers/removeAnnotation.js
+++ b/bigbluebutton-html5/imports/api/2.0/annotations/server/modifiers/removeAnnotation.js
@@ -1,5 +1,5 @@
 import { check } from 'meteor/check';
-import Annotations from '/imports/api/2.0/annotation';
+import Annotations from '/imports/api/2.0/annotations';
 import Logger from '/imports/startup/server/logger';
 
 export default function removeAnnotation(meetingId, whiteboardId, shapeId) {
diff --git a/bigbluebutton-html5/imports/api/2.0/annotation/server/publishers.js b/bigbluebutton-html5/imports/api/2.0/annotations/server/publishers.js
similarity index 87%
rename from bigbluebutton-html5/imports/api/2.0/annotation/server/publishers.js
rename to bigbluebutton-html5/imports/api/2.0/annotations/server/publishers.js
index bdc74a7256..429497ed52 100644
--- a/bigbluebutton-html5/imports/api/2.0/annotation/server/publishers.js
+++ b/bigbluebutton-html5/imports/api/2.0/annotations/server/publishers.js
@@ -1,4 +1,4 @@
-import Annotations from '/imports/api/2.0/annotation';
+import Annotations from '/imports/api/2.0/annotations';
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 import Logger from '/imports/startup/server/logger';
@@ -21,4 +21,4 @@ function publish(...args) {
   return mapToAcl('subscriptions.annotations', boundAnnotations)(args);
 }
 
-Meteor.publish('annotation', publish);
+Meteor.publish('annotations', publish);
diff --git a/bigbluebutton-html5/imports/api/2.0/meetings/server/modifiers/removeMeeting.js b/bigbluebutton-html5/imports/api/2.0/meetings/server/modifiers/removeMeeting.js
index d3daa14da2..ad23d32ac4 100755
--- a/bigbluebutton-html5/imports/api/2.0/meetings/server/modifiers/removeMeeting.js
+++ b/bigbluebutton-html5/imports/api/2.0/meetings/server/modifiers/removeMeeting.js
@@ -4,7 +4,7 @@ import Logger from '/imports/startup/server/logger';
 import clearUsers from '/imports/api/2.0/users/server/modifiers/clearUsers';
 import clearChats from '/imports/api/2.0/chat/server/modifiers/clearChats';
 import clearBreakouts from '/imports/api/2.0/breakouts/server/modifiers/clearBreakouts';
-import clearAnnotations from '/imports/api/2.0/annotation/server/modifiers/clearAnnotations';
+import clearAnnotations from '/imports/api/2.0/annotations/server/modifiers/clearAnnotations';
 import clearSlides from '/imports/api/2.0/slides/server/modifiers/clearSlides';
 import clearPolls from '/imports/api/2.0/polls/server/modifiers/clearPolls';
 import clearCursor from '/imports/api/2.0/cursor/server/modifiers/clearCursor';
diff --git a/bigbluebutton-html5/imports/api/2.0/slides/server/modifiers/clearSlidesPresentation.js b/bigbluebutton-html5/imports/api/2.0/slides/server/modifiers/clearSlidesPresentation.js
index 697e7e13a6..129e37c188 100644
--- a/bigbluebutton-html5/imports/api/2.0/slides/server/modifiers/clearSlidesPresentation.js
+++ b/bigbluebutton-html5/imports/api/2.0/slides/server/modifiers/clearSlidesPresentation.js
@@ -1,7 +1,7 @@
 import Slides from '/imports/api/2.0/slides';
 import Logger from '/imports/startup/server/logger';
 import { check } from 'meteor/check';
-import clearAnnotationsWhiteboard from '/imports/api/2.0/annotation/server/modifiers/clearAnnotationsWhiteboard';
+import clearAnnotationsWhiteboard from '/imports/api/2.0/annotations/server/modifiers/clearAnnotationsWhiteboard';
 
 export default function clearSlidesPresentation(meetingId, presentationId) {
   check(meetingId, String);
diff --git a/bigbluebutton-html5/imports/startup/client/base.jsx b/bigbluebutton-html5/imports/startup/client/base.jsx
index 2405720948..52d4170aff 100755
--- a/bigbluebutton-html5/imports/startup/client/base.jsx
+++ b/bigbluebutton-html5/imports/startup/client/base.jsx
@@ -87,7 +87,7 @@ Base.propTypes = propTypes;
 Base.defaultProps = defaultProps;
 
 const SUBSCRIPTIONS_NAME = [
-  'users2x', 'chat2x', 'cursor2x', 'meetings2x', 'polls2x', 'presentations2x', 'annotation', 'slides2x', 'captions2x', 'breakouts2x', 'voiceUsers',
+  'users2x', 'chat2x', 'cursor2x', 'meetings2x', 'polls2x', 'presentations2x', 'annotations', 'slides2x', 'captions2x', 'breakouts2x', 'voiceUsers',
 ];
 
 const BaseContainer = createContainer(({ params }) => {
diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-group/service.js b/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-group/service.js
index 26248be5d2..13e63bd429 100755
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-group/service.js
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/annotation-group/service.js
@@ -1,4 +1,4 @@
-import Annotations from '/imports/api/2.0/annotation';
+import Annotations from '/imports/api/2.0/annotations';
 
 const getCurrentAnnotations = (whiteboardId) => {
   if (!whiteboardId) {
diff --git a/bigbluebutton-html5/server/main.js b/bigbluebutton-html5/server/main.js
index e52425771b..62474a877f 100755
--- a/bigbluebutton-html5/server/main.js
+++ b/bigbluebutton-html5/server/main.js
@@ -3,7 +3,7 @@ import '/imports/startup/server';
 // 2x
 import '/imports/api/2.0/meetings/server';
 import '/imports/api/2.0/users/server';
-import '/imports/api/2.0/annotation/server';
+import '/imports/api/2.0/annotations/server';
 import '/imports/api/2.0/cursor/server';
 import '/imports/api/2.0/polls/server';
 import '/imports/api/2.0/captions/server';