Ok let see if i am on the right track

Signed-off-by: john mcconnell  johnmcconnell@yahoo.com
I think empty is something we don't need. Overall it would be better to have short names and remove the need for adding the "Panel" suffix.