clenaing up naming convention