Rename Stuff

Signed-off-by: James P. Gilchrist <jgilchrist@emusic.com>