Moving to modern name of package file
Compilation fixes