more random names (thanks to Incursion) and re-ordering