Speed up name handling