sort out names a bit better