Bump ; cleanup ; rename