Removed < and > from naming convention