diff --git a/rpm/nemo-qml-plugin-devicelock.spec b/rpm/nemo-qml-plugin-devicelock.spec
index de13624..ea0f3a9 100644
--- a/rpm/nemo-qml-plugin-devicelock.spec
+++ b/rpm/nemo-qml-plugin-devicelock.spec
@@ -22,7 +22,7 @@ Requires:       nemo-devicelock-daemon
 %{summary}.
 
 %package -n nemo-devicelock-daemon-cli
-Summary:    The default command line lock code device lock daemon for Nemo Mobile
+Summary:    The default command line security code device lock daemon for Nemo Mobile
 Group:      System/GUI/Other
 Requires:   %{name} = %{version}-%{release}
 Provides:   nemo-devicelock-daemon = %{version}-%{release}
diff --git a/src/nemo-devicelock/host/hostauthenticator.cpp b/src/nemo-devicelock/host/hostauthenticator.cpp
index 4b5b894..dc94410 100644
--- a/src/nemo-devicelock/host/hostauthenticator.cpp
+++ b/src/nemo-devicelock/host/hostauthenticator.cpp
@@ -231,7 +231,7 @@ void HostAuthenticator::enterSecurityCode(const QString &code)
     case Idle:
         return;
     case Authenticating:
-        qCDebug(daemon, "Lock code entered for authentication.");
+        qCDebug(daemon, "Security code entered for authentication.");
         switch ((attempts = checkCode(code))) {
         case Success:
         case SecurityCodeExpired:
@@ -243,7 +243,7 @@ void HostAuthenticator::enterSecurityCode(const QString &code)
         }
         break;
     case AuthenticatingForChange:
-        qCDebug(daemon, "Lock code entered for code change authentication.");
+        qCDebug(daemon, "Security code entered for code change authentication.");
         switch ((attempts = checkCode(code))) {
         case Success:
         case SecurityCodeExpired:
@@ -257,7 +257,7 @@ void HostAuthenticator::enterSecurityCode(const QString &code)
         }
         break;
     case EnteringNewSecurityCode:
-        qCDebug(daemon, "New lock code entered.");
+        qCDebug(daemon, "New security code entered.");
         m_newCode = code;
         m_state = RepeatingNewSecurityCode;
         feedback(AuthenticationInput::RepeatNewSecurityCode, -1);
@@ -273,7 +273,7 @@ void HostAuthenticator::enterSecurityCode(const QString &code)
         }
         return;
     case RepeatingNewSecurityCode: {
-        qCDebug(daemon, "New lock code confirmation entered.");
+        qCDebug(daemon, "New security code confirmation entered.");
         if (m_newCode != code) {
             qCDebug(daemon, "Lock codes don't match.");
             m_newCode.clear();
@@ -300,7 +300,7 @@ void HostAuthenticator::enterSecurityCode(const QString &code)
         return;
     }
     case AuthenticatingForClear: {
-        qCDebug(daemon, "Lock code entered for clear authentication.");
+        qCDebug(daemon, "Security code entered for clear authentication.");
         if ((attempts = checkCode(code)) == 0) {
             if (clearCode(code)) {
                 securityCodeCleared();
@@ -345,7 +345,7 @@ void HostAuthenticator::setCodeFinished(int result)
     case Success:
         m_currentCode.clear();
 
-        qCDebug(daemon, "Lock code changed.");
+        qCDebug(daemon, "Security code changed.");
         securityCodeChanged(authenticateChallengeCode(m_challengeCode));
         break;
     case SecurityCodeInHistory:
@@ -367,7 +367,7 @@ void HostAuthenticator::setCodeFinished(int result)
         break;
     default:
         m_currentCode.clear();
-        qCDebug(daemon, "Lock code change failed.");
+        qCDebug(daemon, "Security code change failed.");
 
         abortAuthentication(AuthenticationInput::SoftwareError);
         break;
diff --git a/src/nemo-devicelock/host/hostdevicelock.cpp b/src/nemo-devicelock/host/hostdevicelock.cpp
index 73c9660..bd18f04 100644
--- a/src/nemo-devicelock/host/hostdevicelock.cpp
+++ b/src/nemo-devicelock/host/hostdevicelock.cpp
@@ -266,7 +266,7 @@ void HostDeviceLock::setCodeFinished(int result)
 {
     switch (result) {
     case Success:
-        qCDebug(daemon, "Lock code changed.");
+        qCDebug(daemon, "Security code changed.");
         m_currentCode.clear();
         if (m_state == ChangingSecurityCode || m_state == RepeatingNewSecurityCode) {
             unlockFinished(unlockWithCode(m_newCode));
@@ -294,7 +294,7 @@ void HostDeviceLock::setCodeFinished(int result)
         }
         return;
     default:
-        qCDebug(daemon, "Lock code change failed.");
+        qCDebug(daemon, "Security code change failed.");
         m_currentCode.clear();
         if (m_state == Canceled) {
             m_state = Idle;