diff --git a/Pomodoro/English.lproj/Localizable.strings b/Pomodoro/English.lproj/Localizable.strings
index efcc579..560dd04 100644
--- a/Pomodoro/English.lproj/Localizable.strings
+++ b/Pomodoro/English.lproj/Localizable.strings
@@ -1,5 +1,5 @@
 /* Calendar end text */
-"$duration minutes Pomodoro '$pomodoroName'" = "$duration minutes Timer '$timerName'";
+"$duration minutes Pomodoro '$timerName'" = "$duration minutes Timer '$timerName'";
 
 /* Speech every minutes */
 "$time minutes to go" = "$time minutes to go";
@@ -32,10 +32,10 @@
 "Great! A full pomodoro!" = "Great! A full timer!";
 
 /* Growl pomodoro start */
-"Have a great pomodoro! You have $duration minutes to do '$pomodoroName'." = "Have a great timer! You have $duration minutes to do '$timerName'.";
+"Have a great pomodoro! You have $duration minutes to do '$timerName'." = "Have a great timer! You have $duration minutes to do '$timerName'.";
 
 /* Twitter pomodoro reset */
-"I have just reset pomodoro '$pomodoroName'" = "I have just reset timer '$timerName'";
+"I have just reset pomodoro '$timerName'" = "I have just reset timer '$timerName'";
 
 /* Pomodoro name prompt */
 "Insert here the pomodoro name" = "Insert here the timer name";
@@ -50,16 +50,16 @@
 "interruption over, sorry" = "interruption over, sorry";
 
 /* Twitter break finished */
-"Just finished break after pomodoro '$pomodoroName'" = "Just finished break after timer '$timerName'";
+"Just finished break after pomodoro '$timerName'" = "Just finished break after timer '$timerName'";
 
 /* Twitter pomodoro end */
-"Just finished pomodoro '$pomodoroName'" = "Just finished timer '$timerName'";
+"Just finished pomodoro '$timerName'" = "Just finished timer '$timerName'";
 
 /* Tooltip for finished pomodoros */
 "Just finished: %@" = "Just finished: %@";
 
 /* Twitter pomodoro start */
-"Just started pomodoro '$pomodoroName'" = "Just started timer '$timerName'";
+"Just started pomodoro '$timerName'" = "Just started timer '$timerName'";
 
 /* Tooltip for interrupt-reset pomodoros */
 "Last: %@ (interrupted)" = "Last: %@ (interrupted)";
@@ -122,10 +122,10 @@
 "You have $secs seconds to resume." = "You have $secs seconds to resume.";
 
 /* Mood Message */
-"Pomodoro '$pomodoroName'. Back at $dueTime" = "Timer '$timerName'. Back at $dueTime";
+"Pomodoro '$timerName'. Back at $dueTime" = "Timer '$timerName'. Back at $dueTime";
 
 /* Mood Message Break*/
-"Resting after Pomodoro '$pomodoroName'" = "Resting after Timer '$timerName'";
+"Resting after Pomodoro '$timerName'" = "Resting after Timer '$timerName'";
 
 /* Release Number */
 "Release" = "Release: %@";
diff --git a/Pomodoro/English.lproj/MainMenu.xib b/Pomodoro/English.lproj/MainMenu.xib
index 88c94b7..702caf5 100644
--- a/Pomodoro/English.lproj/MainMenu.xib
+++ b/Pomodoro/English.lproj/MainMenu.xib
@@ -250,7 +250,7 @@
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </comboBoxCell>
                         <connections>
-                            <binding destination="36" name="value" keyPath="values.pomodoroName" id="38"/>
+                            <binding destination="36" name="value" keyPath="values.timerName" id="38"/>
                         </connections>
                     </comboBox>
                     <button verticalHuggingPriority="750" id="30">
diff --git a/Pomodoro/German.lproj/Localizable.strings b/Pomodoro/German.lproj/Localizable.strings
index 5620dda..b28049b 100644
Binary files a/Pomodoro/German.lproj/Localizable.strings and b/Pomodoro/German.lproj/Localizable.strings differ
diff --git a/Pomodoro/German.lproj/MainMenu.xib b/Pomodoro/German.lproj/MainMenu.xib
index 573753b..ce0d59c 100644
--- a/Pomodoro/German.lproj/MainMenu.xib
+++ b/Pomodoro/German.lproj/MainMenu.xib
@@ -251,7 +251,7 @@
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </comboBoxCell>
                         <connections>
-                            <binding destination="36" name="value" keyPath="values.pomodoroName" id="38"/>
+                            <binding destination="36" name="value" keyPath="values.timerName" id="38"/>
                         </connections>
                     </comboBox>
                     <button verticalHuggingPriority="750" id="30">
diff --git a/Pomodoro/Pomodoro-Info.plist b/Pomodoro/Pomodoro-Info.plist
index bdc0402..93e777a 100644
--- a/Pomodoro/Pomodoro-Info.plist
+++ b/Pomodoro/Pomodoro-Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBuildNumber</key>
-	<integer>547</integer>
+	<integer>548</integer>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
diff --git a/Pomodoro/it-IT.lproj/Localizable.strings b/Pomodoro/it-IT.lproj/Localizable.strings
index c4464b8..84c0396 100644
--- a/Pomodoro/it-IT.lproj/Localizable.strings
+++ b/Pomodoro/it-IT.lproj/Localizable.strings
@@ -1,5 +1,5 @@
 /* Calendar end text */
-"$duration minutes Pomodoro '$pomodoroName'" = "$duration minutes Timer '$timerName'";
+"$duration minutes Pomodoro '$timerName'" = "$duration minutes Timer '$timerName'";
 
 /* Speech every minutes */
 "$time minutes to go" = "$time minuti alla fine";
@@ -32,10 +32,10 @@
 "Great! A full pomodoro!" = "Fantastico! Concluso un Timer!";
 
 /* Growl pomodoro start */
-"Have a great pomodoro! You have $duration minutes to do '$pomodoroName'." = "Buon Timer! Hai $duration minuti per completare '$timerName'.";
+"Have a great pomodoro! You have $duration minutes to do '$timerName'." = "Buon Timer! Hai $duration minuti per completare '$timerName'.";
 
 /* Twitter pomodoro reset */
-"I have just reset pomodoro '$pomodoroName'" = "Ho appena annullato '$timerName'";
+"I have just reset pomodoro '$timerName'" = "Ho appena annullato '$timerName'";
 
 /* Pomodoro name prompt */
 "Insert here the pomodoro name" = "Inserisci il nome del Timer";
@@ -50,16 +50,16 @@
 "interruption over, sorry" = "spiacente, Interruzione conclusa";
 
 /* Twitter break finished */
-"Just finished break after pomodoro '$pomodoroName'" = "Ho appena finito di riposare dopo '$timerName'";
+"Just finished break after pomodoro '$timerName'" = "Ho appena finito di riposare dopo '$timerName'";
 
 /* Twitter pomodoro end */
-"Just finished pomodoro '$pomodoroName'" = "Ho appena finito '$timerName'";
+"Just finished pomodoro '$timerName'" = "Ho appena finito '$timerName'";
 
 /* Tooltip for finished pomodoros */
 "Just finished: %@" = "Appena finito: %@";
 
 /* Twitter pomodoro start */
-"Just started pomodoro '$pomodoroName'" = "Ho appena iniziato '$timerName'";
+"Just started pomodoro '$timerName'" = "Ho appena iniziato '$timerName'";
 
 /* Tooltip for interrupt-reset pomodoros */
 "Last: %@ (interrupted)" = "Ultimo: %@ (interrupted)";
@@ -122,10 +122,10 @@
 "You have $secs seconds to resume." = "Hai $secs secondi per riprendere.";
 
 /* Mood Message */
-"Pomodoro '$pomodoroName'. Back at $dueTime" = "Timer '$timerName'. Torno alle $dueTime";
+"Pomodoro '$timerName'. Back at $dueTime" = "Timer '$timerName'. Torno alle $dueTime";
 
 /* Mood Message Break*/
-"Resting after Pomodoro '$pomodoroName'" = "Sto riposando dopo '$timerName'";
+"Resting after Pomodoro '$timerName'" = "Sto riposando dopo '$timerName'";
 
 /* Release Number */
 "Release" = "Release: %@";
diff --git a/Pomodoro/it-IT.lproj/MainMenu.xib b/Pomodoro/it-IT.lproj/MainMenu.xib
index a2af5e7..43d2aa6 100644
--- a/Pomodoro/it-IT.lproj/MainMenu.xib
+++ b/Pomodoro/it-IT.lproj/MainMenu.xib
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+pomodoroName<?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
@@ -6969,15 +6969,15 @@
 			<array class="NSMutableArray" key="connectionRecords">
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: values.pomodoroName</string>
+						<string key="label">value: values.timerName</string>
 						<reference key="source" ref="872363035"/>
 						<reference key="destination" ref="39262419"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="872363035"/>
 							<reference key="NSDestination" ref="39262419"/>
-							<string key="NSLabel">value: values.pomodoroName</string>
+							<string key="NSLabel">value: values.timerName</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">values.pomodoroName</string>
+							<string key="NSKeyPath">values.timerName</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
diff --git a/Pomodoro/src/CommonController.h b/Pomodoro/src/CommonController.h
index 541a3fa..b2ea2cb 100644
--- a/Pomodoro/src/CommonController.h
+++ b/Pomodoro/src/CommonController.h
@@ -25,7 +25,7 @@
 
 #import <Foundation/Foundation.h>
 
-#define _pomodoroName [[NSUserDefaults standardUserDefaults] objectForKey:@"pomodoroName"]
+#define _timerName [[NSUserDefaults standardUserDefaults] objectForKey:@"timerName"]
 #define _initialTime [[[NSUserDefaults standardUserDefaults] objectForKey:@"initialTime"] intValue]
 #define _interruptTime [[[NSUserDefaults standardUserDefaults] objectForKey:@"interruptTime"] intValue]
 #define _breakTime [[[NSUserDefaults standardUserDefaults] objectForKey:@"breakTime"] intValue]
diff --git a/Pomodoro/src/CommonController.m b/Pomodoro/src/CommonController.m
index 5d63505..74d88e2 100644
--- a/Pomodoro/src/CommonController.m
+++ b/Pomodoro/src/CommonController.m
@@ -45,7 +45,7 @@ -(void)observeUserDefault:(NSString*) property{
 }
 
 - (NSString*) bindCommonVariables:(NSString*)name {
-	NSArray* variables = [NSArray arrayWithObjects:@"$pomodoroName", @"$duration", @"$dailyPomodoroDone", @"$globalPomodoroDone",nil];
+	NSArray* variables = [NSArray arrayWithObjects:@"$timerName", @"$duration", @"$dailyPomodoroDone", @"$globalPomodoroDone",nil];
 	NSString* durationString = [[[NSUserDefaults standardUserDefaults] objectForKey:@"initialTime"] stringValue];
 	NSString* dailyPomodoroDone = [[[NSUserDefaults standardUserDefaults] objectForKey:@"dailyPomodoroDone"] stringValue];
 	NSString* globalPomodoroDone = [[[NSUserDefaults standardUserDefaults] objectForKey:@"globalPomodoroDone"] stringValue];
@@ -58,7 +58,7 @@ - (NSString*) bindCommonVariables:(NSString*)name {
 		globalPomodoroDone = @"0";
 	}
     
-	NSArray* values = [NSArray arrayWithObjects:[[NSUserDefaults standardUserDefaults] objectForKey:@"pomodoroName"], durationString, dailyPomodoroDone, globalPomodoroDone, nil];
+	NSArray* values = [NSArray arrayWithObjects:[[NSUserDefaults standardUserDefaults] objectForKey:@"timerName"], durationString, dailyPomodoroDone, globalPomodoroDone, nil];
 	return [Binder substituteDefault:name withVariables:variables andValues:values];
 }	
 
diff --git a/Pomodoro/src/GettingThingsDoneController.m b/Pomodoro/src/GettingThingsDoneController.m
index 8d5d240..f66bf67 100644
--- a/Pomodoro/src/GettingThingsDoneController.m
+++ b/Pomodoro/src/GettingThingsDoneController.m
@@ -66,7 +66,7 @@ -(void) setPomodoroNametoLastBeforeCancel:(NSNotification*)notification {
 	   
 	NSInteger howMany = [namesCombo numberOfItems];
 	if (howMany > 0) {
-		[[NSUserDefaults standardUserDefaults] setObject:[namesCombo itemObjectValueAtIndex:howMany-1] forKey:@"pomodoroName"];
+		[[NSUserDefaults standardUserDefaults] setObject:[namesCombo itemObjectValueAtIndex:howMany-1] forKey:@"timerName"];
 	}
     
 }
@@ -74,7 +74,7 @@ -(void) setPomodoroNametoLastBeforeCancel:(NSNotification*)notification {
 -(void) pomodoroNameGiven:(NSNotification*) notification {
     
     NSInteger howMany = [namesCombo numberOfItems];
-    NSString* name = _pomodoroName;
+    NSString* name = _timerName;
     BOOL isNewName = YES;
     NSInteger i = 0;
     while ((isNewName) && (i<howMany)) {
diff --git a/Pomodoro/src/PomodoroArrayController.m b/Pomodoro/src/PomodoroArrayController.m
index 763a67a..388e81f 100644
--- a/Pomodoro/src/PomodoroArrayController.m
+++ b/Pomodoro/src/PomodoroArrayController.m
@@ -33,7 +33,7 @@ - (id) newPomodoro:(NSInteger)duration withExternalInterruptions:(NSInteger)exte
 	id newPomodoro = [super newObject]; 
     NSDate *now = [NSDate date];
 	[newPomodoro setValue:now forKey:@"when"]; 
-    [newPomodoro setValue:[[NSUserDefaults standardUserDefaults] objectForKey:@"pomodoroName"] forKey:@"name"]; 
+    [newPomodoro setValue:[[NSUserDefaults standardUserDefaults] objectForKey:@"timerName"] forKey:@"name"]; 
 
 	[newPomodoro setValue:[NSNumber numberWithLong:duration] forKey:@"durationMinutes"]; 
 	[newPomodoro setValue:[NSNumber numberWithLong:externalInterruptions] forKey:@"externalInterruptions"]; 
diff --git a/Pomodoro/src/PomodoroController.m b/Pomodoro/src/PomodoroController.m
index 49ad74c..e9ea998 100644
--- a/Pomodoro/src/PomodoroController.m
+++ b/Pomodoro/src/PomodoroController.m
@@ -228,7 +228,7 @@ - (IBAction) quickStats:(id)sender {
     
     NSInteger time = pomodoro.time;	
 	NSString* quickStats = [NSString stringWithFormat:NSLocalizedString(@"QuickStatistics",@"Quick statistic format string"), 
-							_pomodoroName, time/60, time%60, 
+							_timerName, time/60, time%60, 
 							pomodoro.externallyInterrupted, pomodoro.internallyInterrupted, pomodoro.resumed,
 							_globalPomodoroStarted, _globalPomodoroDone, _globalPomodoroReset,
 							_dailyPomodoroStarted, _dailyPomodoroDone, _dailyPomodoroReset,
@@ -340,7 +340,7 @@ -(void) pomodoroStarted:(NSNotification*) notification {
 	
 	[[NSUserDefaults standardUserDefaults] setObject: [NSNumber numberWithInt:(_dailyPomodoroStarted)+1] forKey:@"dailyPomodoroStarted"];
 	[[NSUserDefaults standardUserDefaults] setObject: [NSNumber numberWithInt:(_globalPomodoroStarted)+1] forKey:@"globalPomodoroStarted"];
-	NSString* name = [NSString stringWithFormat:NSLocalizedString(@"Working on: %@",@"Tooltip for running Pomodoro"), _pomodoroName];
+	NSString* name = [NSString stringWithFormat:NSLocalizedString(@"Working on: %@",@"Tooltip for running Pomodoro"), _timerName];
 	[statusItem setToolTip:name];		
 		
 }
@@ -349,7 +349,7 @@ -(void) pomodoroExternallyInterrupted:(NSNotification*) notification {
 	
     [[NSUserDefaults standardUserDefaults] setObject: [NSNumber numberWithInt:(_dailyExternalInterruptions)+1] forKey:@"dailyExternalInterruptions"];
 	[[NSUserDefaults standardUserDefaults] setObject: [NSNumber numberWithInt:(_globalExternalInterruptions)+1] forKey:@"globalExternalInterruptions"];
-	NSString* name = [NSString stringWithFormat:NSLocalizedString(@"Externally Interrupted: %@",@"Tooltip for Interruption"), _pomodoroName];
+	NSString* name = [NSString stringWithFormat:NSLocalizedString(@"Externally Interrupted: %@",@"Tooltip for Interruption"), _timerName];
 	[statusItem setToolTip:name];
 			
 }
@@ -360,7 +360,7 @@ -(void) pomodoroInternallyInterrupted:(NSNotification*) notification {
     [[NSUserDefaults standardUserDefaults] setObject: [NSNumber numberWithInt:(_dailyInternalInterruptions)+1] forKey:@"dailyInternalInterruptions"];
     [[NSUserDefaults standardUserDefaults] setObject: [NSNumber numberWithInt:(_globalInternalInterruptions)+1] forKey:@"globalInternalInterruptions"];
     
- 	NSString* name = [NSString stringWithFormat:NSLocalizedString(@"Internally Interrupted: %@",@"Tooltip for Interruption"), _pomodoroName];
+ 	NSString* name = [NSString stringWithFormat:NSLocalizedString(@"Internally Interrupted: %@",@"Tooltip for Interruption"), _timerName];
 	[statusItem setToolTip:name];
     
 }
@@ -370,7 +370,7 @@ -(void) pomodoroInterruptionMaxTimeIsOver:(NSNotification*) notification {
 
     [[NSUserDefaults standardUserDefaults] setObject: [NSNumber numberWithInt:(_dailyPomodoroReset)+1] forKey:@"dailyPomodoroReset"];
 	[[NSUserDefaults standardUserDefaults] setObject: [NSNumber numberWithInt:(_globalPomodoroReset)+1] forKey:@"globalPomodoroReset"];
-    NSString* name = [NSString stringWithFormat:NSLocalizedString(@"Last: %@ (interrupted)",@"Tooltip for interrupt-reset pomodoros"), _pomodoroName];
+    NSString* name = [NSString stringWithFormat:NSLocalizedString(@"Last: %@ (interrupted)",@"Tooltip for interrupt-reset pomodoros"), _timerName];
 	[statusItem setToolTip:name];
 
 	[self updateMenu];
@@ -381,7 +381,7 @@ -(void) pomodoroReset:(NSNotification*) notification {
 
     [[NSUserDefaults standardUserDefaults] setObject: [NSNumber numberWithInt:(_dailyPomodoroReset)+1] forKey:@"dailyPomodoroReset"];
 	[[NSUserDefaults standardUserDefaults] setObject: [NSNumber numberWithInt:(_globalPomodoroReset)+1] forKey:@"globalPomodoroReset"];
-	NSString* name = [NSString stringWithFormat:NSLocalizedString(@"Last: %@ (reset)",@"Tooltip for reset pomodoro"), _pomodoroName];
+	NSString* name = [NSString stringWithFormat:NSLocalizedString(@"Last: %@ (reset)",@"Tooltip for reset pomodoro"), _timerName];
 	[statusItem setToolTip:name];
 
 }
@@ -390,7 +390,7 @@ -(void) pomodoroResumed:(NSNotification*) notification {
     
 	[[NSUserDefaults standardUserDefaults] setObject: [NSNumber numberWithInt:(_dailyPomodoroResumed)+1] forKey:@"dailyPomodoroResumed"];
 	[[NSUserDefaults standardUserDefaults] setObject: [NSNumber numberWithInt:(_globalPomodoroResumed)+1] forKey:@"globalPomodoroResumed"];
-    NSString* name = [NSString stringWithFormat:NSLocalizedString(@"Working on: %@",@"Tooltip for running Pomodoro"), _pomodoroName];
+    NSString* name = [NSString stringWithFormat:NSLocalizedString(@"Working on: %@",@"Tooltip for running Pomodoro"), _timerName];
 	[statusItem setToolTip:name];
 	[statusItem setImage:pomodoroImage];
 
@@ -398,14 +398,14 @@ -(void) pomodoroResumed:(NSNotification*) notification {
 
 -(void) breakStarted:(NSNotification*) notification {
 	
-    NSString* name = [NSString stringWithFormat:NSLocalizedString(@"Break after: %@",@"Tooltip for break"), _pomodoroName];
+    NSString* name = [NSString stringWithFormat:NSLocalizedString(@"Break after: %@",@"Tooltip for break"), _timerName];
 	[statusItem setToolTip:name];
 	[self updateMenu];
 }
 
 -(void) breakFinished:(NSNotification*) notification {
 	
-	NSString* name = [NSString stringWithFormat:NSLocalizedString(@"Just finished: %@",@"Tooltip for finished pomodoros"), _pomodoroName];
+	NSString* name = [NSString stringWithFormat:NSLocalizedString(@"Just finished: %@",@"Tooltip for finished pomodoros"), _timerName];
 	[statusItem setToolTip:name];
 	
 	[self updateMenu];
@@ -438,7 +438,7 @@ -(void) pomodoroFinished:(NSNotification*) notification {
 	[[NSUserDefaults standardUserDefaults] setObject: [NSNumber numberWithInt:(_globalPomodoroDone)+1] forKey:@"globalPomodoroDone"];
     longBreakCounter++;
     
-	NSString* name = [NSString stringWithFormat:NSLocalizedString(@"Just finished: %@",@"Tooltip for finished pomodoros"), _pomodoroName];
+	NSString* name = [NSString stringWithFormat:NSLocalizedString(@"Just finished: %@",@"Tooltip for finished pomodoros"), _timerName];
 	[statusItem setToolTip:name];
 	
 
diff --git a/Pomodoro/src/PomodoroDefaults.m b/Pomodoro/src/PomodoroDefaults.m
index 24712ff..41719e3 100644
--- a/Pomodoro/src/PomodoroDefaults.m
+++ b/Pomodoro/src/PomodoroDefaults.m
@@ -56,11 +56,11 @@ + (void) setDefaults {
 	[defaultValues setObject: [NSNumber numberWithShort:44] forKey:@"quickStatsCode"];
 	[defaultValues setObject: [NSNumber numberWithUnsignedInteger:10223616] forKey:@"quickStatsFlags"];
 
-	[defaultValues setObject:NSLocalizedString(@"Have a great pomodoro! You have $duration minutes to do '$pomodoroName'.",@"Growl pomodoro start") forKey:@"growlStart"];
+	[defaultValues setObject:NSLocalizedString(@"Have a great pomodoro! You have $duration minutes to do '$timerName'.",@"Growl pomodoro start") forKey:@"growlStart"];
 	[defaultValues setObject:NSLocalizedString(@"Ready, set, go",@"Speech pomodoro start") forKey:@"speechStart"];
     NSString* script = NSLocalizedString(@"-- insert here your Applescript",@"Applescript placeholder");
 	[defaultValues setObject:[NSData dataWithData:[script dataUsingEncoding:NSUTF8StringEncoding]] forKey:@"scriptStart"];
-	[defaultValues setObject:NSLocalizedString(@"Just started pomodoro '$pomodoroName'",@"Twitter pomodoro start") forKey:@"twitterStart"];
+	[defaultValues setObject:NSLocalizedString(@"Just started pomodoro '$timerName'",@"Twitter pomodoro start") forKey:@"twitterStart"];
 	
 	[defaultValues setObject:NSLocalizedString(@"You have $secs seconds to resume.",@"Growl pomodoro interrupt") forKey:@"growlInterrupt"];
 	[defaultValues setObject:NSLocalizedString(@"You have $secs seconds to resume",@"Speech pomodoro interrupt") forKey:@"speechInterrupt"];
@@ -73,7 +73,7 @@ + (void) setDefaults {
 	[defaultValues setObject:NSLocalizedString(@"Not a good one? Just try again!",@"Growl pomodoro reset") forKey:@"growlReset"];
 	[defaultValues setObject:NSLocalizedString(@"Try again",@"Speech pomodoro reset") forKey:@"speechReset"];
     [defaultValues setObject:[NSData dataWithData:[script dataUsingEncoding:NSUTF8StringEncoding]] forKey:@"scriptReset"];
-	[defaultValues setObject:NSLocalizedString(@"I have just reset pomodoro '$pomodoroName'",@"Twitter pomodoro reset") forKey:@"twitterReset"];
+	[defaultValues setObject:NSLocalizedString(@"I have just reset pomodoro '$timerName'",@"Twitter pomodoro reset") forKey:@"twitterReset"];
 
 	[defaultValues setObject:NSLocalizedString(@"... and we're back!",@"Growl pomodoro resume") forKey:@"growlResume"];
 	[defaultValues setObject:NSLocalizedString(@"And we are back!",@"Speech pomodoro resume") forKey:@"speechResume"];
@@ -82,7 +82,7 @@ + (void) setDefaults {
 	[defaultValues setObject:NSLocalizedString(@"Great! A full pomodoro!",@"Growl pomodoro end") forKey:@"growlEnd"];
 	[defaultValues setObject:NSLocalizedString(@"Well done!",@"Speech pomodoro end") forKey:@"speechEnd"];
 	[defaultValues setObject:[NSData dataWithData:[script dataUsingEncoding:NSUTF8StringEncoding]] forKey:@"scriptEnd"];
-	[defaultValues setObject:NSLocalizedString(@"Just finished pomodoro '$pomodoroName'",@"Twitter pomodoro end") forKey:@"twitterEnd"];
+	[defaultValues setObject:NSLocalizedString(@"Just finished pomodoro '$timerName'",@"Twitter pomodoro end") forKey:@"twitterEnd"];
 	
 	[defaultValues setObject:NSLocalizedString(@"Other $mins minutes passed by. $passed total minutes spent.",@"Growl every minutes") forKey:@"growlEvery"];
 	[defaultValues setObject:NSLocalizedString(@"$time minutes to go",@"Speech every minutes") forKey:@"speechEvery"];
@@ -91,7 +91,7 @@ + (void) setDefaults {
 	[defaultValues setObject:NSLocalizedString(@"Ready for another one?",@"Growl break finsihed") forKey:@"growlBreakFinished"];
 	[defaultValues setObject:NSLocalizedString(@"Ready for next one?",@"Speech break finished") forKey:@"speechBreakFinished"];
     [defaultValues setObject:[NSData dataWithData:[script dataUsingEncoding:NSUTF8StringEncoding]] forKey:@"scriptBreakFinished"];
-	[defaultValues setObject:NSLocalizedString(@"Just finished break after pomodoro '$pomodoroName'",@"Twitter break finished") forKey:@"twitterBreakFinished"];
+	[defaultValues setObject:NSLocalizedString(@"Just finished break after pomodoro '$timerName'",@"Twitter break finished") forKey:@"twitterBreakFinished"];
 	
 	[defaultValues setObject:@"Alex" forKey:@"defaultVoice"];
 	
@@ -165,10 +165,10 @@ + (void) setDefaults {
 	
 	[defaultValues setObject:[NSNumber numberWithBool:NO] forKey:@"calendarEnabled"];
 	[defaultValues setObject:@"Pomodoros" forKey:@"selectedCalendar"];
-	[defaultValues setObject:NSLocalizedString(@"$duration minutes Pomodoro '$pomodoroName'", @"Calendar end text") forKey:@"calendarEnd"];
+	[defaultValues setObject:NSLocalizedString(@"$duration minutes Pomodoro '$timerName'", @"Calendar end text") forKey:@"calendarEnd"];
 
 		
-	[defaultValues setObject:NSLocalizedString(@"Insert here the pomodoro name",@"Pomodoro name prompt") forKey:@"pomodoroName"];
+	[defaultValues setObject:NSLocalizedString(@"Insert here the pomodoro name",@"Pomodoro name prompt") forKey:@"timerName"];
 	[defaultValues setObject:[NSNumber numberWithBool:NO] forKey:@"startOnLoginEnabled"];
 	[defaultValues setObject:[NSNumber numberWithBool:YES] forKey:@"showSplashScreenAtStartup"];
  	[defaultValues setObject:[NSNumber numberWithBool:YES] forKey:@"preventSleepDuringPomodoro"];
@@ -183,8 +183,8 @@ + (void) setDefaults {
 	[defaultValues setObject:[NSNumber numberWithBool:NO] forKey:@"ichatEnabled"];
 	[defaultValues setObject:[NSNumber numberWithBool:NO] forKey:@"skypeEnabled"];
 	[defaultValues setObject:[NSNumber numberWithBool:NO] forKey:@"adiumEnabled"];
-    [defaultValues setObject:NSLocalizedString(@"Pomodoro '$pomodoroName'. Back at $dueTime", @"Mood Message") forKey:@"moodMessageInPomodoro"];
-    [defaultValues setObject:NSLocalizedString(@"Resting after Pomodoro '$pomodoroName'", @"Mood Message Break") forKey:@"moodMessageInPomodoroBreak"];
+    [defaultValues setObject:NSLocalizedString(@"Pomodoro '$timerName'. Back at $dueTime", @"Mood Message") forKey:@"moodMessageInPomodoro"];
+    [defaultValues setObject:NSLocalizedString(@"Resting after Pomodoro '$timerName'", @"Mood Message Break") forKey:@"moodMessageInPomodoroBreak"];
 
 
 	[[NSUserDefaults standardUserDefaults] registerDefaults:defaultValues];		
diff --git a/Pomodoro/src/StartCommand.m b/Pomodoro/src/StartCommand.m
index dc6c254..5ecbb60 100644
--- a/Pomodoro/src/StartCommand.m
+++ b/Pomodoro/src/StartCommand.m
@@ -54,7 +54,7 @@ - (id)performDefaultImplementation {
     }
     
     if (nil != name) {
-        [[NSUserDefaults standardUserDefaults] setObject: name forKey:@"pomodoroName"];
+        [[NSUserDefaults standardUserDefaults] setObject: name forKey:@"timerName"];
     }
     
     if ((nil == name) || (0 == duration)) {
@@ -63,7 +63,7 @@ - (id)performDefaultImplementation {
         [pomoController start:@"direct"];
     }
         
-    return [NSString stringWithFormat:@"Timer %@(%d,%d) started", _pomodoroName, _initialTime, _breakTime];
+    return [NSString stringWithFormat:@"Timer %@(%d,%d) started", _timerName, _initialTime, _breakTime];
 
 }