Removed module names from headers