code cleanup (no func change): rename, standardize #

#3847

Just cleaning up the code before I make functional changes (to include featured themes at the top)