Handle long names