Rename modules. Fix bounds extend