Update short name constraints

Fix #23