improved url naming