Added @name annotation handling in comments