Update imports to use name of file rather than file and extension, update validation error to be in line with GDS