edited names for proper use