Cleaned up name and symbol expansion