Renamed files to match pkg name