Amend of naming conversion