Major rewrite. Provide short names for each command.

34 files changed, 360 insertions, 328 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index a736b48..523cac1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -16,36 +16,36 @@
 
 MANPAGES1=\
  eclat.1\
- eclat-allocate-address.1\
- eclat-associate-address.1\
- eclat-attach-volume.1\
- eclat-create-image.1\
- eclat-create-snapshot.1\
- eclat-create-tags.1\
- eclat-create-volume.1\
- eclat-delete-snapshot.1\
- eclat-delete-tags.1\
- eclat-deregister-image.1\
- eclat-describe-addresses.1\
+ eclat-allocaddr.1\
+ eclat-assocaddr.1\
+ eclat-atvol.1\
+ eclat-mkimg.1\
+ eclat-mksnap.1\
+ eclat-mktag.1\
+ eclat-mkvol.1\
+ eclat-rmsnap.1\
+ eclat-rmtag.1\
+ eclat-deimg.1\
+ eclat-lsaddr.1\
  eclat-describe-availability-zones.1\
- eclat-describe-images.1\
- eclat-describe-instance-attribute.1\
- eclat-describe-instance-status.1\
- eclat-describe-instances.1\
- eclat-describe-regions.1\
- eclat-describe-security-groups.1\
- eclat-describe-snapshot-attribute.1\
- eclat-describe-snapshots.1\
- eclat-describe-tags.1\
- eclat-describe-volumes.1\
- eclat-detach-volume.1\
- eclat-disassociate-address.1\
- eclat-modify-instance-attribute.1\
- eclat-get-console-output.1\
- eclat-start-instances.1\
- eclat-stop-instances.1\
- eclat-reboot-instances.1\
- eclat-release-address.1
+ eclat-lsimg.1\
+ eclat-lsiattr.1\
+ eclat-lsistat.1\
+ eclat-lsinst.1\
+ eclat-lsreg.1\
+ eclat-lssg.1\
+ eclat-lssattr.1\
+ eclat-lssnap.1\
+ eclat-lstag.1\
+ eclat-lsvol.1\
+ eclat-devol.1\
+ eclat-disasaddr.1\
+ eclat-setiattr.1\
+ eclat-conmesg.1\
+ eclat-start.1\
+ eclat-stop.1\
+ eclat-reboot.1\
+ eclat-freeaddr.1
 
 MANPAGES5=\
  eclat.conf.5
diff --git a/doc/eclat-allocate-address.1 b/doc/eclat-allocaddr.1
index 75f4241..2c97280 100644
--- a/doc/eclat-allocate-address.1
+++ b/doc/eclat-allocaddr.1
@@ -13,16 +13,16 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Eclat.  If not, see <http://www.gnu.org/licenses/>.
-.TH ALLOCATE\-ADDRESS 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH ALLOCADDR 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
 .SH NAME
-eclat allocate\-address \- allocate an Elastic IP address
+eclat allocaddr \- allocate an Elastic IP address
 .SH SYNOPSIS
-\fBeclat allocate\-address\fR [\fB\-v\fR] [\f\--vpc\fR] 
+\fBeclat allocaddr\fR [\fB\-v\fR] [\f\--vpc\fR] 
 
-\fBeclat allocate\-address\fR \fB\-\-help\fR
+\fBeclat allocaddr\fR \fB\-\-help\fR
 .SH DESCRIPTION
 The
-.B allocate\-address
+.B allocaddr
 command allocates an Elastic IP address.  It does not take arguments.
 .PP
 .SH OPTIONS
@@ -37,8 +37,8 @@ On success, the code 0 is returned to the shell.  Non-zero status code
 is returned on error.
 .SH "SEE ALSO"
 .BR eclat (1),
-.BR eclat\-associate\-address (1),
-.BR eclat\-release\-address (1).
+.BR eclat\-assocaddr (1),
+.BR eclat\-freeaddr (1).
 .SH AUTHORS
 Sergey Poznyakoff
 .SH "BUG REPORTS"
diff --git a/doc/eclat-associate-address.1 b/doc/eclat-assocaddr.1
index cc45341..5c84232 100644
--- a/doc/eclat-associate-address.1
+++ b/doc/eclat-assocaddr.1
@@ -13,18 +13,18 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Eclat.  If not, see <http://www.gnu.org/licenses/>.
-.TH ASSOCIATE\-ADDRESS 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH ASSOCADDR 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
 .SH NAME
-eclat associate\-address \- associate an IP address with an instance
+eclat assocaddr \- associate an IP address with an instance
 .SH SYNOPSIS
-\fBeclat associate\-address\fR [\fIOPTIONS\fR] \fIINSTANCE\fR \fIIP\fR
+\fBeclat assocaddr\fR [\fIOPTIONS\fR] \fIINSTANCE\fR \fIIP\fR
 
-\fBeclat associate\-address\fR [\fIOPTIONS\fR] \fIINSTANCE\fR \fIALLOC\-ID\fR
+\fBeclat assocaddr\fR [\fIOPTIONS\fR] \fIINSTANCE\fR \fIALLOC\-ID\fR
 
-\fBeclat associate\-address\fR \fB\-\-help\fR
+\fBeclat assocaddr\fR \fB\-\-help\fR
 .SH DESCRIPTION
 The
-.B associate\-address
+.B assocaddr
 command associates an Elastic IP address with an non-VPC instance or
 associates a VPC Elastic IP address with an instance in your VPC.
 .PP
@@ -62,19 +62,19 @@ is unable to recognize the response.
 Assign an Elastic IP to the instance:
 .P
 .nf
-.B eclat associate\-address i\-2ea64347 192.0.2.1
+.B eclat assocaddr i\-2ea64347 192.0.2.1
 .fi
 .SS 2.
 Associate an IP address with an instance in the VPC:
 .P
 .nf
-.B eclat associate\-address \-\-vpc i\-4fd2431a eipalloc\-5723d13e
+.B eclat assocaddr \-\-vpc i\-4fd2431a eipalloc\-5723d13e
 .fi
 .SH "SEE ALSO"
 .BR eclat (1),
-.BR eclat\-allocate\-address (1),
-.BR eclat\-release\-address (1),
-.BR eclat\-disassociate\-address (1).
+.BR eclat\-allocaddr (1),
+.BR eclat\-freeaddr (1),
+.BR eclat\-disassaddr (1).
 .SH AUTHORS
 Sergey Poznyakoff
 .SH "BUG REPORTS"
diff --git a/doc/eclat-attach-volume.1 b/doc/eclat-atvol.1
index 7566eca..87c85bf 100644
--- a/doc/eclat-attach-volume.1
+++ b/doc/eclat-atvol.1
@@ -13,15 +13,15 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Eclat.  If not, see <http://www.gnu.org/licenses/>.
-.TH ECLAT\-ATTACH\-VOLUME 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH ECLAT\-ATVOL 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
 .SH NAME
-eclat attach\-volume \- attach a volume to an instance
+eclat atvol \- attach a volume to an instance
 .SH SYNOPSIS
-\fBeclat attach\-volume\fR \fBVOL\-ID\fR \fBINST\-ID\fR \fBDEV\-NAME\fR
+\fBeclat atvol\fR \fBVOL\-ID\fR \fBINST\-ID\fR \fBDEV\-NAME\fR
 
-\fBeclat attach\-volume\fR \fB\-\-help\fR
+\fBeclat atvol\fR \fB\-\-help\fR
 .SH DESCRIPTION
-The \fBattach\-volume\fR command attaches an existing volume to an EC2
+The \fBatvol\fR command attaches an existing volume to an EC2
 instance.  The
 .B VOL\-ID
 argument specifies the identifier of the volume to attach.  If ID
@@ -40,15 +40,15 @@ argument specifies the name of the device to use for this volume.
 .SH EXAMPLE
 .nf
 .sp 2
-$ \fBeclat attach\-volume vol-12340156 i-40ed7ef3 /dev/xvdf\fR
+$ \fBeclat atvol vol-12340156 i-40ed7ef3 /dev/xvdf\fR
 vol-12340156 attaching i-40ed7ef3 /dev/xvdf
 .fi
 .SH "SEE ALSO"
 .BR eclat (1),
-.BR eclat-create-volume (1),
-.BR eclat-delete-volume (1),
-.BR eclat-describe-volumes (1),
-.BR eclat-detach-volume (1).
+.BR eclat-mkvol (1),
+.BR eclat-rmvol (1),
+.BR eclat-lsvol (1),
+.BR eclat-devol (1).
 .SH AUTHORS
 Sergey Poznyakoff
 .SH "BUG REPORTS"
diff --git a/doc/eclat-get-console-output.1 b/doc/eclat-conmesg.1
index bb30637..60c2011 100644
--- a/doc/eclat-get-console-output.1
+++ b/doc/eclat-conmesg.1
@@ -13,16 +13,16 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Eclat.  If not, see <http://www.gnu.org/licenses/>.
-.TH GET\-CONSOLE\-OUTPUT 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH MESG 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
 .SH NAME
-eclat get\-console\-output \- get console output from the instance
+eclat conmesg \- get console output from the instance
 .SH SYNOPSIS
-\fBeclat get\-console\-output\fR \fIINSTANCE\-ID\fR
+\fBeclat conmesg\fR \fIINSTANCE\-ID\fR
 
-\fBeclat get\-console\-output\fR \fB\-\-help\fR
+\fBeclat conmesg\fR \fB\-\-help\fR
 .SH DESCRIPTION
 The command
-.B get\-console\-output
+.B conmesg
 retrieves and prints on the standard output the console output for the
 specified instance.
 .SH "SEE ALSO"
diff --git a/doc/eclat-deregister-image.1 b/doc/eclat-deimg.1
index 95030d5..8da014c 100644
--- a/doc/eclat-deregister-image.1
+++ b/doc/eclat-deimg.1
@@ -13,13 +13,13 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Eclat.  If not, see <http://www.gnu.org/licenses/>.
-.TH DEREGISTER\-IMAGE 1 "April 11, 2013" "ECLAT" "Eclat User Reference"
+.TH DEIMG 1 "April 11, 2013" "ECLAT" "Eclat User Reference"
 .SH NAME
-eclat deregister\-image \- deregister an EC2 image
+eclat deimg \- deregister an EC2 image
 .SH SYNOPSIS
-\fBeclat deregister\-image\fR \fBID\fR
+\fBeclat deimg\fR \fBID\fR
 
-\fBeclat deregister\-image\fR \fB\-\-help\fR
+\fBeclat deimg\fR \fB\-\-help\fR
 .SH DESCRIPTION
 This command deregisters an existing Amazon image (AMI) identified by
 \fBID\fR.
@@ -31,7 +31,7 @@ the command treat the ID as a symbolic name and uses the \fBImageId\fR
 map to translate it.
 .PP
 Note that this command does not destroy other resources associated with the
-image, such as snapshots.  Use the \fBeclat delete\-snapshot\fR
+image, such as snapshots.  Use the \fBeclat rmsnap\fR
 command for that.
 .SH OPTIONS
 .TP
@@ -39,9 +39,9 @@ command for that.
 Display a short usage summary.
 .SH "SEE ALSO"
 .BR eclat (1),
-.BR eclat\-delete\-snapshot (1),
-.BR eclat\-create\-image (1),
-.BR eclat\-describe\-images (1).
+.BR eclat\-rmsnap (1),
+.BR eclat\-mkimg (1),
+.BR eclat\-lsimg (1).
 .SH AUTHORS
 Sergey Poznyakoff
 .SH "BUG REPORTS"
diff --git a/doc/eclat-detach-volume.1 b/doc/eclat-devol.1
index 00b2246..a06417c 100644
--- a/doc/eclat-detach-volume.1
+++ b/doc/eclat-devol.1
@@ -13,16 +13,16 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Eclat.  If not, see <http://www.gnu.org/licenses/>.
-.TH ECLAT\-DETACH\-VOLUME 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH ECLAT\-DEVOL 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
 .SH NAME
-eclat detach\-volume \- detach a volume from an instance
+eclat devol \- detach a volume from an instance
 .SH SYNOPSIS
-\fBeclat detach\-volume\fR [\fB\-f\fR] [\fB\-\-force\fR] \fBVOL\-ID\fR\
+\fBeclat devol\fR [\fB\-f\fR] [\fB\-\-force\fR] \fBVOL\-ID\fR\
  [\fBINST\-ID\fR [\fBDEV\-NAME\fR]]
 
-\fBeclat detach\-volume\fR \fB\-\-help\fR
+\fBeclat devol\fR \fB\-\-help\fR
 .SH DESCRIPTION
-The \fBdetach\-volume\fR command detaches a volume from an EC2
+The \fBdevol\fR command detaches a volume from an EC2
 instance.  The volume is identified by the
 .B VOL\-ID
 argument, which specifies its identifier or symbolic name (if 
@@ -41,15 +41,15 @@ specifies the name of the device that refers to this volume.
 .SH EXAMPLE
 .nf
 .sp 2
-$ \fBeclat detach\-volume vol-12340156 i-40ed7ef3 /dev/xvdf\fR
+$ \fBeclat devol vol-12340156 i-40ed7ef3 /dev/xvdf\fR
 vol-12340156 detaching i-40ed7ef3 /dev/xvdf
 .fi
 .SH "SEE ALSO"
 .BR eclat (1),
-.BR eclat-attach-volume (1),
-.BR eclat-create-volume (1),
-.BR eclat-delete-volume (1),
-.BR eclat-describe-volumes (1).
+.BR eclat-atvol (1),
+.BR eclat-mkvol (1),
+.BR eclat-rmvol (1),
+.BR eclat-lsvol (1).
 .SH AUTHORS
 Sergey Poznyakoff
 .SH "BUG REPORTS"
diff --git a/doc/eclat-disassociate-address.1 b/doc/eclat-disasaddr.1
index 81529f1..a76659b 100644
--- a/doc/eclat-disassociate-address.1
+++ b/doc/eclat-disasaddr.1
@@ -13,13 +13,13 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Eclat.  If not, see <http://www.gnu.org/licenses/>.
-.TH DISASSOCIATE\-ADDRESS 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH DISASSOCADDR 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
 .SH NAME
-eclat disassociate\-address \- disassociate IP address from EC2 instance.
+eclat disassaddr \- disassociate IP address from EC2 instance.
 .SH SYNOPSIS
-\fBeclat disassociate\-address\fR [\fB\-\-vpc\fR] [\fB\-v\fR] IP
+\fBeclat disassaddr\fR [\fB\-\-vpc\fR] [\fB\-v\fR] IP
 
-\fBeclat disassociate\-address\fR \fB\-\-help\fR
+\fBeclat disassaddr\fR \fB\-\-help\fR
 .SH DESCRIPTION
 This command disassociates IP address from the EC2 instance.
 .SH OPTIONS
@@ -41,17 +41,17 @@ is unable to recognize the response.
 Disassociate the Elastic IP:
 .P
 .nf
-.B eclat disassociate\-address 192.0.2.1
+.B eclat disassaddr 192.0.2.1
 .fi
 .SS 2.
 Disassociate the VPC Elastic IP:
 .P
 .nf
-.B eclat disassociate\-address \-\-vpc eipalloc\-5723d13e
+.B eclat disassaddr \-\-vpc eipalloc\-5723d13e
 .fi
 .SH "SEE ALSO"
 .BR eclat (1),
-.BR eclat\-associate\-address (1).
+.BR eclat\-assocaddr (1).
 .SH AUTHORS
 Sergey Poznyakoff
 .SH "BUG REPORTS"
diff --git a/doc/eclat-release-address.1 b/doc/eclat-freeaddr.1
index f1b0224..847e7d5 100644
--- a/doc/eclat-release-address.1
+++ b/doc/eclat-freeaddr.1
@@ -13,17 +13,17 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Eclat.  If not, see <http://www.gnu.org/licenses/>.
-.TH DISASSOCIATE\-ADDRESS 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH DISASSOCADDR 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
 .SH NAME
-eclat release\-address \- release Elastic IP address.
+eclat freeaddr \- release Elastic IP address.
 .SH SYNOPSIS
-\fBeclat release\-address\fR [\fB\-\-vpc\fR] [\fB\-v\fR] \fIIP\-OR\-ALLOCID\fR
+\fBeclat freeaddr\fR [\fB\-\-vpc\fR] [\fB\-v\fR] \fIIP\-OR\-ALLOCID\fR
 
-\fBeclat release\-address\fR \fB\-\-help\fR
+\fBeclat freeaddr\fR \fB\-\-help\fR
 .SH DESCRIPTION
 This command releases an Elastic IP address.  The address must have been
 previously allocated using the
-.B allocate-address
+.B allocaddr
 command.
 .SH OPTIONS
 .TP
@@ -46,26 +46,26 @@ The code 16 is returned if the operation is not confirmed.
 Release the Elastic IP:
 .P
 .nf
-.B $ eclat release\-address 192.0.2.1
+.B $ eclat freeaddr 192.0.2.1
 Really release IP 192.0.2.1 [Y/n] y
 .fi
 .SS 2.
 Same, with confirmation disabled:
 .P
 .nf
-.B $ eclat -Y release\-address 192.0.2.1
+.B $ eclat -Y freeaddr 192.0.2.1
 .fi
 .SS 3.
 Release the VPC Elastic IP:
 .P
 .nf
-.B eclat release\-address \-\-vpc eipalloc\-5723d13e
+.B eclat freeaddr \-\-vpc eipalloc\-5723d13e
 .fi
 .SH "SEE ALSO"
 .BR eclat (1),
-.BR eclat\-allocate\-address (1),
-.BR eclat\-associate\-address (1),
-.BR eclat\-disassociate\-address (1).
+.BR eclat\-allocaddr (1),
+.BR eclat\-assocaddr (1),
+.BR eclat\-disassaddr (1).
 .SH AUTHORS
 Sergey Poznyakoff
 .SH "BUG REPORTS"
diff --git a/doc/eclat-describe-addresses.1 b/doc/eclat-lsaddr.1
index bbfd4ca..8ae1565 100644
--- a/doc/eclat-describe-addresses.1
+++ b/doc/eclat-lsaddr.1
@@ -13,14 +13,14 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Eclat.  If not, see <http://www.gnu.org/licenses/>.
-.TH DESCRIBE\-ADDRESSES 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH LSADDR 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
 .SH NAME
-eclat describe\-addresses \- return information about IP addresses in
+eclat lsaddr \- return information about IP addresses in
 your account
 .SH SYNOPSIS
-\fBeclat describe\-addresses\fR [\fB\-v\fR] [\fB\-\-vpc\fR] [\fBFILTER\fR...]
+\fBeclat lsaddr\fR [\fB\-v\fR] [\fB\-\-vpc\fR] [\fBFILTER\fR...]
 
-\fBeclat describe\-addresses\fR \fB\-\-help\fR
+\fBeclat lsaddr\fR \fB\-\-help\fR
 .SH DESCRIPTION
 This command returns information about Elastic IP addresses allocated
 for your account.  By default all allocated addresses are described.
@@ -67,17 +67,17 @@ allocation ID and association ID.
 .sp
 .nf
 .in +2
-$ eclat describe-addresses
+$ eclat lsaddr
 standard	192.0.2.1	i-f15ebb98
 standard	198.51.100.2
 .in
 .fi
 .SH "SEE ALSO"
 .BR eclat (1),
-.BR eclat\-allocate\-address (1),
-.BR eclat\-release\-address (1),
-.BR eclat\-associate\-address (1),
-.BR eclat\-disassociate\-address (1).
+.BR eclat\-allocaddr (1),
+.BR eclat\-freeaddr (1),
+.BR eclat\-assocaddr (1),
+.BR eclat\-disassaddr (1).
 .SH AUTHORS
 Sergey Poznyakoff
 .SH "BUG REPORTS"
diff --git a/doc/eclat-describe-instance-attribute.1 b/doc/eclat-lsiattr.1
index d4ce503..403c156 100644
--- a/doc/eclat-describe-instance-attribute.1
+++ b/doc/eclat-lsiattr.1
@@ -13,13 +13,13 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Eclat.  If not, see <http://www.gnu.org/licenses/>.
-.TH DESCRIBE\-INSTANCE\-ATTRIBUTE 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH LSIATTR 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
 .SH NAME
-eclat describe\-instance\-attribute \- describes attribute of an instance
+eclat lsiattr \- describes attribute of an instance
 .SH SYNOPSIS
-\fBeclat describe\-instance\-attribute\fR \fIINSTANCE-ID\fR \fIATTR\fR
+\fBeclat lsiattr\fR \fIINSTANCE-ID\fR \fIATTR\fR
 
-\fBeclat describe\-instance\-attribute\fR \fB\-\-help\fR
+\fBeclat lsiattr\fR \fB\-\-help\fR
 .SH DESCRIPTION
 Describes the specified attribute of an instance.  Only one attribute
 can be described at a time.
@@ -45,9 +45,9 @@ The \fIATTR\fR argument can be one of the following:
 .BR  ebsOptimized .
 .SH "SEE ALSO"
 .BR eclat (1),
-.BR eclat-modify-instance-attribute (1),
-.BR eclat-describe-instance-status (1),
-.BR eclat-describe-instances (1).
+.BR eclat-setiattr (1),
+.BR eclat-lsistat (1),
+.BR eclat-lsinst (1).
 .SH AUTHORS
 Sergey Poznyakoff
 .SH "BUG REPORTS"
diff --git a/doc/eclat-describe-images.1 b/doc/eclat-lsimg.1
index b939cc7..da945bb 100644
--- a/doc/eclat-describe-images.1
+++ b/doc/eclat-lsimg.1
@@ -13,17 +13,17 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Eclat.  If not, see <http://www.gnu.org/licenses/>.
-.TH DESCRIBE\-IMAGES 1 "April 18, 2013" "ECLAT" "Eclat User Reference"
+.TH LSIMG 1 "April 18, 2013" "ECLAT" "Eclat User Reference"
 .SH NAME
-eclat describe\-images \- describe available Amazon images
+eclat lsimg \- describe available Amazon images
 .SH SYNOPSIS
-\fBeclat describe\-images\fB\
+\fBeclat lsimg\fB\
  [\fB\-a\fR] [\fB\-u\fR \fIID\fR]\
  [\fB\-x\fR \fIID\fR] [\fB\-\-owner\fR=\fIID\fR]
                       [\fB\-\-executable\-by\fR=\fIID\fR]\
  [\fIFILTER\fR...] [\fIAMI\fR...]
 
-\fBeclat describe\-images\fB \fB\-\-help\fR
+\fBeclat lsimg\fB \fB\-\-help\fR
 .SH DESCRIPTION
 This command lists available Amazon images.
 .PP
@@ -181,8 +181,8 @@ tag:Name="db server"
 .SH EXAMPLE
 .SH "SEE ALSO"
 .BR eclat (1),
-.BR eclat\-create\-image (1),
-.BR eclat\-deregister\-image (1).
+.BR eclat\-mkimg (1),
+.BR eclat\-deimg (1).
 .SH AUTHORS
 Sergey Poznyakoff
 .SH "BUG REPORTS"
diff --git a/doc/eclat-describe-instances.1 b/doc/eclat-lsinst.1
index e0126cc..e2d21a0 100644
--- a/doc/eclat-describe-instances.1
+++ b/doc/eclat-lsinst.1
@@ -13,13 +13,13 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Eclat.  If not, see <http://www.gnu.org/licenses/>.
-.TH DESCRIBE\-INSTANCES 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH LSINST 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
 .SH NAME
-eclat describe\-instances \- describe available EC2 instances
+eclat lsinst \- describe available EC2 instances
 .SH SYNOPSIS
-\fBeclat describe\-instances\fR [\fIFILTER\fR...]
+\fBeclat lsinst\fR [\fIFILTER\fR...]
 
-\fBeclat describe\-instances\fR \fB\-\-help\fR
+\fBeclat lsinst\fR \fB\-\-help\fR
 .SH DESCRIPTION
 This command lists your EC2 instances.
 .SH FILTERS
@@ -335,10 +335,10 @@ End of instance
 .fi
 .SH "SEE ALSO"
 .BR eclat (1),
-.BR eclat\-describe\-instance\-attribute (1),
-.BR eclat\-reboot\-instances (1),
-.BR eclat\-start\-instances (1),
-.BR eclat\-stop\-instances (1).
+.BR eclat\-lsiattr (1),
+.BR eclat\-reboot (1),
+.BR eclat\-start (1),
+.BR eclat\-stop (1).
 .SH AUTHORS
 Sergey Poznyakoff
 .SH "BUG REPORTS"
diff --git a/doc/eclat-describe-instance-status.1 b/doc/eclat-lsistat.1
index f1a47bf..6e9b9d7 100644
--- a/doc/eclat-describe-instance-status.1
+++ b/doc/eclat-lsistat.1
@@ -13,13 +13,13 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Eclat.  If not, see <http://www.gnu.org/licenses/>.
-.TH DESCRIBE\-INSTANCE\-STATUS 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH LSISTAT 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
 .SH NAME
-eclat describe\-instance\-status \- describe status of EC2 instances
+eclat lsistat \- describe status of EC2 instances
 .SH SYNOPSIS
-\fBeclat describe\-instance\-status\fR [\fB\-a\fR] [\fB\-\-all\fR] [\fBFILTER\fR...]
+\fBeclat lsistat\fR [\fB\-a\fR] [\fB\-\-all\fR] [\fBFILTER\fR...]
 
-\fBeclat describe\-instance\-status\fR \fB\-\-help\fR
+\fBeclat lsistat\fR \fB\-\-help\fR
 .SH DESCRIPTION
 Describes the status of selected EC2 instances including any scheduled
 events.  This information includes:
@@ -147,7 +147,7 @@ In the example below the long lines are split for readability:
 .sp
 .nf
 .in +2
-$ eclat describe\-instance\-status \-a
+$ eclat lsistat \-a
 i\-283f9f47 us\-east\-1d running impaired\
  Sys.reachability=failed Inst.reachability=failed
 i\-283f9f47	Event: "The instance is running on degraded hardware"
@@ -157,8 +157,8 @@ i\-d2e36dbd us\-east\-1d running ok\
 .fi
 .SH "SEE ALSO"
 .BR eclat (1),
-.BR eclat\-describe\-instances (1),
-.BR eclat\-describe\-instance\-attribute (1).
+.BR eclat\-lsinst (1),
+.BR eclat\-lsiattr (1).
 .SH AUTHORS
 Sergey Poznyakoff
 .SH "BUG REPORTS"
diff --git a/doc/eclat-describe-regions.1 b/doc/eclat-lsreg.1
index f0e5f65..4ee550c 100644
--- a/doc/eclat-describe-regions.1
+++ b/doc/eclat-lsreg.1
@@ -13,13 +13,13 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Eclat.  If not, see <http://www.gnu.org/licenses/>.
-.TH ECLAT\-DESCRIBE\-REGIONS 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH ECLAT\-LSREG 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
 .SH NAME
-eclat describe\-regions \- describe EC2 regions
+eclat lsreg \- describe EC2 regions
 .SH SYNOPSIS
-\fBeclat describe\-regions\fR [\fBFILTER\fR...] [\fBREGION\fR...]
+\fBeclat lsreg\fR [\fBFILTER\fR...] [\fBREGION\fR...]
 
-\fBeclat describe\-regions\fR \fB\-\-help\fR
+\fBeclat lsreg\fR \fB\-\-help\fR
 .SH DESCRIPTION
 This command lists the EC2 regions.  If no arguments are provided, it
 lists all regions available to the account.  Otherwise, each argument
@@ -41,7 +41,7 @@ horizontal tab character.
 .SH EXAMPLE
 .nf
 .sp 2
-$ \fBeclat describe-regions\fR
+$ \fBeclat lsreg\fR
 eu-west-1       ec2.eu-west-1.amazonaws.com
 sa-east-1       ec2.sa-east-1.amazonaws.com
 us-east-1       ec2.us-east-1.amazonaws.com
diff --git a/doc/eclat-describe-snapshot-attribute.1 b/doc/eclat-lssattr.1
index fdc26a2..161a388 100644
--- a/doc/eclat-describe-snapshot-attribute.1
+++ b/doc/eclat-lssattr.1
@@ -13,13 +13,13 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Eclat.  If not, see <http://www.gnu.org/licenses/>.
-.TH DESCRIBE\-SNAPSHOT\-ATTRIBUTE 1 "April 18, 2013" "ECLAT" "Eclat User Reference"
+.TH LSSATTR 1 "April 18, 2013" "ECLAT" "Eclat User Reference"
 .SH NAME
-eclat describe\-snapshot\-attribute \- lists the attribute of a EBS snapshot
+eclat lssattr \- lists the attribute of a EBS snapshot
 .SH SYNOPSIS
-\fBeclat describe\-snapshot\-attribute\fB \fBSNAP\-ID\fR [\fBATTR\fR]
+\fBeclat lssattr\fB \fBSNAP\-ID\fR [\fBATTR\fR]
 
-\fBeclat describe\-snapshot\-attribute\fB \fB\-\-help\fR
+\fBeclat lssattr\fB \fB\-\-help\fR
 .SH DESCRIPTION
 Thic command outputs the value of the attribute \fBATTR\fR of the EBS
 snapshot \fBSNAP\-ID\fR.  The latter is either the snapshot
@@ -38,11 +38,11 @@ Describes the create volume permissions of the snapshot.
 Describes the product codes associated with the snapshot.
 .SH "SEE ALSO"
 .BR eclat (1),
-.BR eclat\-create\-snapshot (1),
-.BR eclat\-delete\-snapshot (1),
-.BR eclat\-describe\-snapshots (1),
-.BR eclat\-modify\-snapshot\-attribute (1),
-.BR eclat\-reset\-snapshot\-attribute (1).
+.BR eclat\-mksnap (1),
+.BR eclat\-rmsnap (1),
+.BR eclat\-lssnap (1),
+.BR eclat\-setsattr (1),
+.BR eclat\-clrsattr (1).
 .SH AUTHORS
 Sergey Poznyakoff
 .SH "BUG REPORTS"
diff --git a/doc/eclat-describe-security-groups.1 b/doc/eclat-lssg.1
index fa8e44b..86ab244 100644
--- a/doc/eclat-describe-security-groups.1
+++ b/doc/eclat-lssg.1
@@ -13,14 +13,14 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Eclat.  If not, see <http://www.gnu.org/licenses/>.
-.TH DESCRIBE\-SECURITY\-GROUPS 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH LSSEC 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
 .SH NAME
-eclat describe\-security\-groups \- return information about security groups 
+eclat lssg \- return information about security groups 
 .SH SYNOPSIS
-\fBeclat describe\-security\-groups\fR [\fB\-n\fR] [\fB\-\-name\fR]\
+\fBeclat lssg\fR [\fB\-n\fR] [\fB\-\-name\fR]\
  [\fBFILTER\fR...] [\fBID\fR]
 
-\fBeclat describe\-security\-groups\fR \fB\-\-help\fR
+\fBeclat lssg\fR \fB\-\-help\fR
 .SH DESCRIPTION
 This command returns information about security groups.  By default,
 all security groups pertaining to your account will be described.
diff --git a/doc/eclat-describe-snapshots.1 b/doc/eclat-lssnap.1
index 223d59b..cecb7af 100644
--- a/doc/eclat-describe-snapshots.1
+++ b/doc/eclat-lssnap.1
@@ -13,16 +13,16 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with Eclat.  If not, see <http://www.gnu.org/licenses/>.
-.TH DESCRIBE\-SNAPSHOTS 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
+.TH LSSNAP 1 "January 19, 2013" "ECLAT" "Eclat User Reference"
 .SH NAME
-eclat describe\-snapshots \- describes available Amazon EBS snapshots
+eclat lssnap \- describes available Amazon EBS snapshots
 .SH SYNOPSIS
-\fBeclat describe\-snapshots\fR [\fB\-r\fR \fIID\fR] [\fB\-u \fIID\fR]\
+\fBeclat lssnap\fR [\fB\-r\fR \fIID\fR] [\fB\-u \fIID\fR]\
  [\fI\-\-restorable\-by \fIID\fR]
                          [\fB\-\-owner \fINAME\fR]\
  [\fISNAPSHOT\-ID\fR...] [\fBFILTER\fI...]
 
-\fBeclat describe\-snapshots\fR \fB\-\-help\fR
+\fBeclat lssnap\fR \fB\-\-help\fR
 .SH DESCRIPTION
 This command lists the Amazon EBS snapshots available to you.  These include
 public snapshots available to any AWS account, your private snapshots and
@@ -139,8 +139,8 @@ snap\-12345678 vol\-4d826724 10 completed	100% 2012\-04\