Replace common module definition name to unique values.
Updated todo.