Modified module names in core library