Refactoring collision point names and added more checks.