Changed module names to shorter ones so that they will be easier to reference