Fixed common names and pathes