diff --git a/README b/README
index a4548d573..dc5a176d2 100644
--- a/README
+++ b/README
@@ -38,7 +38,7 @@ contacts.
 They may include most any service which provides a syndication feed (both RSS
 and Atom). This allows you to view communications from friends in other 
 diverse social networks - such as Diaspora, Google Buzz, and millions of 
-Wordpress blogs, news services, and other websites. You can also import
+blogs, news services, and other websites. You can also import
 contacts from (and write to) anybody that is accessible from your email
 INBOX and view them in your social stream. Over time we will try to
 build two-way bridges to other services so that you can freely
diff --git a/mod/editpost.php b/mod/editpost.php
index 16acc76e1..3c92e8bbe 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -18,12 +18,12 @@ function editpost_content(&$a) {
 		return;
 	}
 
-	$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+	$itm = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 		intval($post_id),
 		intval(local_user())
 	);
 
-	if(! count($r)) {
+	if(! count($itm)) {
 		notice( t('Item not found') . EOL);
 		return;
 	}
@@ -94,7 +94,7 @@ function editpost_content(&$a) {
 		'$noloc' => t('Clear browser location'),
 		'$wait' => t('Please wait'),
 		'$permset' => t('Permission settings'),
-		'$content' => $r[0]['body'],
+		'$content' => $itm[0]['body'],
 		'$post_id' => $post_id,
 		'$baseurl' => $a->get_baseurl(),
 		'$defloc' => $a->user['default-location'],