add dynamic names where possible