Fixed issues with outdated file referencing conventions