renamed files according to FFaker convention (_mx). Removed bugs