Change name of clases and file property.
Resolving conflicts.