Some updates to names and classes
fixed conflict