diff --git a/libs/ardour/luabindings.cc b/libs/ardour/luabindings.cc
index eb6fcf1233..b8b336c933 100644
--- a/libs/ardour/luabindings.cc
+++ b/libs/ardour/luabindings.cc
@@ -743,7 +743,7 @@ LuaBindings::common (lua_State* L)
 		.beginClass <MusicSample> ("MusicSample")
 		.addConstructor <void (*) (samplepos_t, int32_t)> ()
 		.addFunction ("set", &MusicSample::set)
-		.addData ("frame", &MusicSample::sample)
+		.addData ("sample", &MusicSample::sample)
 		.addData ("division", &MusicSample::division)
 		.endClass ()
 
@@ -790,7 +790,7 @@ LuaBindings::common (lua_State* L)
 		// templated class definitions
 		.beginClass <PBD::PropertyDescriptor<bool> > ("BoolProperty").endClass ()
 		.beginClass <PBD::PropertyDescriptor<float> > ("FloatProperty").endClass ()
-		.beginClass <PBD::PropertyDescriptor<samplepos_t> > ("FrameposProperty").endClass ()
+		.beginClass <PBD::PropertyDescriptor<samplepos_t> > ("SampleposProperty").endClass ()
 		// actual references (TODO: also expose GQuark for std::set)
 		//   ardour/region.h
 		.addConst ("Start", &ARDOUR::Properties::start)
@@ -805,7 +805,7 @@ LuaBindings::common (lua_State* L)
 		// expand templated PropertyDescriptor<T>
 		.addFunction ("containsBool", &PBD::PropertyChange::contains<bool>)
 		.addFunction ("containsFloat", &PBD::PropertyChange::contains<float>)
-		.addFunction ("containsFramePos", &PBD::PropertyChange::contains<samplepos_t>)
+		.addFunction ("containsSamplePos", &PBD::PropertyChange::contains<samplepos_t>)
 		.endClass ()
 
 		.beginClass <PBD::PropertyList> ("PropertyList")
@@ -1752,13 +1752,13 @@ LuaBindings::common (lua_State* L)
 		.beginClass <TempoMap> ("TempoMap")
 		.addFunction ("add_tempo", &TempoMap::add_tempo)
 		.addFunction ("add_meter", &TempoMap::add_meter)
-		.addFunction ("tempo_section_at_frame", (TempoSection& (TempoMap::*)(samplepos_t))&TempoMap::tempo_section_at_sample)
-		.addFunction ("tempo_section_at_frame", (const TempoSection& (TempoMap::*)(samplepos_t) const)&TempoMap::tempo_section_at_sample)
-		.addFunction ("meter_section_at_frame", &TempoMap::meter_section_at_sample)
+		.addFunction ("tempo_section_at_sample", (TempoSection& (TempoMap::*)(samplepos_t))&TempoMap::tempo_section_at_sample)
+		.addFunction ("tempo_section_at_sample", (const TempoSection& (TempoMap::*)(samplepos_t) const)&TempoMap::tempo_section_at_sample)
+		.addFunction ("meter_section_at_sample", &TempoMap::meter_section_at_sample)
 		.addFunction ("meter_section_at_beat", &TempoMap::meter_section_at_beat)
-		.addFunction ("bbt_at_frame", &TempoMap::bbt_at_sample)
-		.addFunction ("exact_beat_at_frame", &TempoMap::exact_beat_at_sample)
-		.addFunction ("exact_qn_at_frame", &TempoMap::exact_qn_at_sample)
+		.addFunction ("bbt_at_sample", &TempoMap::bbt_at_sample)
+		.addFunction ("exact_beat_at_sample", &TempoMap::exact_beat_at_sample)
+		.addFunction ("exact_qn_at_sample", &TempoMap::exact_qn_at_sample)
 		.addFunction ("samplepos_plus_qn", &TempoMap::samplepos_plus_qn)
 		.addFunction ("framewalk_to_qn", &TempoMap::framewalk_to_qn)
 		.endClass ()
@@ -2254,8 +2254,8 @@ LuaBindings::common (lua_State* L)
 		.addFunction ("last_transport_start", &Session::last_transport_start)
 		.addFunction ("goto_start", &Session::goto_start)
 		.addFunction ("goto_end", &Session::goto_end)
-		.addFunction ("current_start_frame", &Session::current_start_sample)
-		.addFunction ("current_end_frame", &Session::current_end_sample)
+		.addFunction ("current_start_sample", &Session::current_start_sample)
+		.addFunction ("current_end_sample", &Session::current_end_sample)
 		.addFunction ("actively_recording", &Session::actively_recording)
 		.addFunction ("new_audio_track", &Session::new_audio_track)
 		.addFunction ("new_audio_route", &Session::new_audio_route)