GRAND RENAME

Signed-off-by: J Phani Mahesh <phanimahesh@gmail.com>
Merge upstream changes
Merge pull request #1 from phanimahesh/devel

GRAND RENAME