Compilation fixes for renamed files