#213 rename variable
#213 rename variable
#213 unify names for distribution selection components