Simplifying names - fixes #2