Fixed references to attributes in the modules