cleaning up naming conv.