Fix bug related to contact person in office form and rename all files