Improve and rename dyn