Names should come first

Fix #18