Removed remaining AT_NAME references