Correct entry point names