fixing the names to better align