Renamed repository
Few fixes