copyright/naming cleanup