Added better name conventions for the target files