Fixed naming consistency & init file paths.