Fixed imports following the new naming