Added more short names