diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
index 1f8a99b3..142b13fd 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
@@ -132,9 +132,9 @@ open class Session : RealmObject(), SessionInterface, Savable,
 	}
 
 	/**
-	 * Start a session
+	 * Start or continue a session
 	 */
-	fun startSession() {
+	fun startOrContinue() {
 		realm.executeTransaction {
 			when (getState()) {
 				SessionState.PENDING -> {
@@ -155,7 +155,7 @@ open class Session : RealmObject(), SessionInterface, Savable,
 	/**
 	 * Pause a session
 	 */
-	fun pauseSession() {
+	fun pause() {
 		realm.executeTransaction {
 			when (getState()) {
 				SessionState.STARTED -> {
@@ -169,7 +169,7 @@ open class Session : RealmObject(), SessionInterface, Savable,
 	/**
 	 * Stop a session
 	 */
-	fun stopSession() {
+	fun stop() {
 		realm.executeTransaction {
 			when (getState()) {
 				SessionState.STARTED, SessionState.PAUSED -> {
@@ -185,7 +185,7 @@ open class Session : RealmObject(), SessionInterface, Savable,
 	/**
 	 * Restart a session
 	 */
-	fun restartSession() {
+	fun restart() {
 		realm.executeTransaction {
 			this.timeFrame?.paused = false
 			this.timeFrame?.pauseDate = null
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
index afdc0ef3..573a1e34 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
@@ -234,10 +234,10 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott
 	private fun manageSessionState() {
 		when (currentSession.getState()) {
 			SessionState.PENDING, SessionState.PAUSED -> {
-				currentSession.startSession()
+				currentSession.startOrContinue()
 			}
 			SessionState.STARTED -> {
-				currentSession.pauseSession()
+				currentSession.pause()
 			}
 			else -> {
 			}
@@ -249,7 +249,7 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott
 	 * Stop the current session
 	 */
 	private fun stopSession() {
-		currentSession.stopSession()
+		currentSession.stop()
 		updateSessionUI()
 	}
 
@@ -257,7 +257,7 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott
 	 * Restart timer
 	 */
 	private fun restartTimer() {
-		currentSession.restartSession()
+		currentSession.restart()
 		updateSessionUI()
 	}