Made nick suffix a bit more dynamic