added file and small fixes in naming