Change local to community module location, fixes for names