diff --git a/neo/io/neuroshareapiio.py b/neo/io/neuroshareapiio.py
index aa65e1d6c..23f352c84 100644
--- a/neo/io/neuroshareapiio.py
+++ b/neo/io/neuroshareapiio.py
@@ -98,7 +98,7 @@ def __init__(self, filename=None, dllpath=None):
         epochID = 3
         # if a filename was given, create a dictionary with information that will
         # be needed later on.
-        if self.filename != None:
+        if self.filename is not None:
             if dllpath is not None:
                 name = os.path.splitext(os.path.basename(dllpath))[0]
                 library = ns.Library(name, dllpath)
@@ -222,19 +222,19 @@ def read_segment(self,
         # read triggers (in this case without any duration)
         for i in range(self.metadata["num_trigs"]):
             # create event object for each trigger/bit found
-            eva = self.read_eventarray(channel_index=self.metadata["triggersId"][i],
+            eva = self.read_event(channel_index=self.metadata["triggersId"][i],
                                        segment_duration=segment_duration,
                                        t_start=t_start, )
             # add event object to segment
-            seg.eventarrays += [eva]
+            seg.events += [eva]
         # read epochs (digital events with duration)
         for i in range(self.metadata["num_digiEpochs"]):
             # create event object for each trigger/bit found
-            epa = self.read_epocharray(channel_index=self.metadata["digiEpochId"][i],
+            epa = self.read_epoch(channel_index=self.metadata["digiEpochId"][i],
                                        segment_duration=segment_duration,
                                        t_start=t_start, )
             # add event object to segment
-            seg.epocharrays += [epa]
+            seg.epochs += [epa]
         # read nested spiketrain
         # run through all spike channels found
         for i in range(self.metadata["num_spkChans"]):
@@ -352,7 +352,7 @@ def read_spiketrain(self,
 
         return spiketr
 
-    def read_eventarray(self, lazy=False, channel_index=0,
+    def read_event(self, lazy=False, channel_index=0,
                         t_start=0.,
                         segment_duration=0.):
         """function to read digital timestamps. this function only reads the event
@@ -390,7 +390,7 @@ def read_eventarray(self, lazy=False, channel_index=0,
                     description="the trigger events (without durations)")
         return eva
 
-    def read_epocharray(self, lazy=False,
+    def read_epoch(self, lazy=False,
                         channel_index=0,
                         t_start=0.,
                         segment_duration=0.):
diff --git a/neo/io/neurosharectypesio.py b/neo/io/neurosharectypesio.py
index ed9ce0b69..91f7c1fb8 100644
--- a/neo/io/neurosharectypesio.py
+++ b/neo/io/neurosharectypesio.py
@@ -87,7 +87,7 @@ class NeurosharectypesIO(BaseIO):
         ...
         >>> print seg.spiketrains
         []
-        >>> print seg.eventarrays
+        >>> print seg.events
         [<EventArray: 1@1.12890625 s, 1@2.02734375 s, 1@3.82421875 s>]
 
     Note:
@@ -198,7 +198,7 @@ def read_segment(self, import_neuroshare_segment=True,
                 ea.times = times * pq.s
                 ea.labels = np.array(labels, dtype='S')
 
-                seg.eventarrays.append(ea)
+                seg.events.append(ea)
 
             # analog
             if entity_types[entityInfo.dwEntityType] == 'ns_ENTITY_ANALOG':