move stuff into better names