Changing package name to avoid annotation name clashing with existing class name

(cherry picked from commit 5696ebdb3c45507f7b1398bd6200cfb3b89875e9)