Renamed files and fixes for ubuntu