Added keyword naming to package identifiers