update to new convention/name
fix keywords