13 files changed, 21 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index e11d4fe..95a8c7f 100644
--- a/Makefile
+++ b/Makefile
@@ -111,14 +111,14 @@ install: build
 	ln -sf debootstrap $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)/scripts/mmdebstrap
 	ln -sf container-create-debootstrap.1 $(DESTDIR)/usr/share/man/man1/container-create-mmdebstrap.1
 
-	ln -sf console $(DESTDIR)/usr/lib/$(PROJECT)/$(PROGRAM)/con
+	ln -sf create $(DESTDIR)/usr/lib/$(PROJECT)/$(PROGRAM)/cr
 	ln -sf list $(DESTDIR)/usr/lib/$(PROJECT)/$(PROGRAM)/ls
 	ln -sf move $(DESTDIR)/usr/lib/$(PROJECT)/$(PROGRAM)/mv
+	ln -sf remove $(DESTDIR)/usr/lib/$(PROJECT)/$(PROGRAM)/rm
+	ln -sf restart $(DESTDIR)/usr/lib/$(PROJECT)/$(PROGRAM)/rs
 	ln -sf start $(DESTDIR)/usr/lib/$(PROJECT)/$(PROGRAM)/s
 	ln -sf status $(DESTDIR)/usr/lib/$(PROJECT)/$(PROGRAM)/st
 	ln -sf stop $(DESTDIR)/usr/lib/$(PROJECT)/$(PROGRAM)/t
-	ln -sf remove $(DESTDIR)/usr/lib/$(PROJECT)/$(PROGRAM)/rm
-	ln -sf version $(DESTDIR)/usr/lib/$(PROJECT)/$(PROGRAM)/ver
 
 	mkdir -p $(DESTDIR)/lib/systemd/system
 	cp -r share/systemd/* $(DESTDIR)/lib/systemd/system
diff --git a/share/bash-completion/container b/share/bash-completion/container
index 4bc386a..0013394 100644
--- a/share/bash-completion/container
+++ b/share/bash-completion/container
@@ -44,7 +44,7 @@ _container()
 			return 0
 			;;
 
-		console|con)
+		console)
 			case "${prev}" in
 				-n|--name)
 					opts="$(container list -s -f shell)"
@@ -60,7 +60,7 @@ _container()
 			esac
 			;;
 
-		create)
+		create|cr)
 			case "${prev}" in
 				-n|--name)
 					opts="$(cd /etc/open-infrastructure/container/debconf 2>/dev/null && ls *.cfg */*.cfg 2>/dev/null | sed -e 's|.*/||g' -e 's|.cfg$||g')"
@@ -189,7 +189,7 @@ _container()
 			esac
 			;;
 
-		restart)
+		restart|rt)
 			case "${prev}" in
 				-n|--name)
 					opts="$(container list -s -f shell)"
diff --git a/share/man/container-create-debconf.1.txt b/share/man/container-create-debconf.1.txt
index e6f2582..18eedbc 100644
--- a/share/man/container-create-debconf.1.txt
+++ b/share/man/container-create-debconf.1.txt
@@ -31,8 +31,13 @@ container-create-debconf - Create an advanced Debian based container with debcon
 SYNOPSIS
 --------
 *container create -s debconf* ['OPTIONS']
+*cnt cr -s debconf* ['OPTIONS']
+
 *container create -s debian* ['OPTIONS']
+*cnt cr -s debian* ['OPTIONS']
+
 *container create -s progress-linux* ['OPTIONS']
+*cnt cr -s progress-linux* ['OPTIONS']
 
 
 DESCRIPTION
diff --git a/share/man/container-create-debootstrap.1.txt b/share/man/container-create-debootstrap.1.txt
index 5268eb7..43950af 100644
--- a/share/man/container-create-debootstrap.1.txt
+++ b/share/man/container-create-debootstrap.1.txt
@@ -31,8 +31,10 @@ container-create-debootstrap - Create a basic Debian based container with deboot
 SYNOPSIS
 --------
 *container create -s debootstrap* ['OPTIONS']
-*container create -s mmdebstrap* ['OPTIONS']
+*cnt cr -s debootstrap* ['OPTIONS']
 
+*container create -s mmdebstrap* ['OPTIONS']
+*cnt cr -s mmdebstrap* ['OPTIONS']
 
 DESCRIPTION
 -----------
diff --git a/share/man/container-create.1.txt b/share/man/container-create.1.txt
index 6df0c2f..5ba4637 100644
--- a/share/man/container-create.1.txt
+++ b/share/man/container-create.1.txt
@@ -31,6 +31,7 @@ container-create - Create a container
 SYNOPSIS
 --------
 *container create* ['OPTIONS']
+*cnt cr* ['OPTIONS']
 
 
 DESCRIPTION
diff --git a/share/man/container-list.1.txt b/share/man/container-list.1.txt
index 1916a6b..897ea9c 100644
--- a/share/man/container-list.1.txt
+++ b/share/man/container-list.1.txt
@@ -31,7 +31,6 @@ container-list - List container on the system
 SYNOPSIS
 --------
 *container list* ['OPTIONS']
-
 *container ls* ['OPTIONS']
 
 
diff --git a/share/man/container-move.1.txt b/share/man/container-move.1.txt
index 2320dfb..5543ab2 100644
--- a/share/man/container-move.1.txt
+++ b/share/man/container-move.1.txt
@@ -31,8 +31,7 @@ container-move - Rename a container
 SYNOPSIS
 --------
 *container move* ['OPTIONS']
-
-*container mv* ['OPTIONS']
+*cnt mv* ['OPTIONS']
 
 
 DESCRIPTION
diff --git a/share/man/container-remove.1.txt b/share/man/container-remove.1.txt
index b3fb1f7..cdcda76 100644
--- a/share/man/container-remove.1.txt
+++ b/share/man/container-remove.1.txt
@@ -31,8 +31,7 @@ container-remove - Remove a container
 SYNOPSIS
 --------
 *container remove* ['OPTIONS']
-
-*container rm* ['OPTIONS']
+*cnt rm* ['OPTIONS']
 
 
 DESCRIPTION
diff --git a/share/man/container-restart.1.txt b/share/man/container-restart.1.txt
index f3780b6..d452f32 100644
--- a/share/man/container-restart.1.txt
+++ b/share/man/container-restart.1.txt
@@ -31,6 +31,7 @@ container-restart - Restart a container
 SYNOPSIS
 --------
 *container restart* ['OPTIONS']
+*cnt rs* ['OPTIONS']
 
 
 DESCRIPTION
diff --git a/share/man/container-start.1.txt b/share/man/container-start.1.txt
index 544d155..90750c0 100644
--- a/share/man/container-start.1.txt
+++ b/share/man/container-start.1.txt
@@ -31,6 +31,7 @@ container-start - Start a container
 SYNOPSIS
 --------
 *container start* ['OPTIONS']
+*cnt s* ['OPTIONS']
 
 
 DESCRIPTION
diff --git a/share/man/container-status.1.txt b/share/man/container-status.1.txt
index d4d06a9..86820df 100644
--- a/share/man/container-status.1.txt
+++ b/share/man/container-status.1.txt
@@ -31,6 +31,7 @@ container-status - Show container status
 SYNOPSIS
 --------
 *container status* ['OPTIONS']
+*cnt st* ['OPTIONS']
 
 
 DESCRIPTION
diff --git a/share/man/container-stop.1.txt b/share/man/container-stop.1.txt
index 62cfcd3..ec9e48d 100644
--- a/share/man/container-stop.1.txt
+++ b/share/man/container-stop.1.txt
@@ -31,6 +31,7 @@ container-stop - Stop a container
 SYNOPSIS
 --------
 *container stop* ['OPTIONS']
+*cnt t* ['OPTIONS']
 
 
 DESCRIPTION
diff --git a/share/man/container-version.1.txt b/share/man/container-version.1.txt
index d774401..060f393 100644
--- a/share/man/container-version.1.txt
+++ b/share/man/container-version.1.txt
@@ -32,8 +32,6 @@ SYNOPSIS
 --------
 *container version* ['OPTIONS']
 
-*container ver* ['OPTIONS']
-
 
 DESCRIPTION
 -----------