..F....... [DEV-536] fixed incorrect class names